Fix generation numbers for autonav

[empserver] / include / nuke.h

diff --git a/include/nuke.h b/include/nuke.h
index c27f1cab6a9291be15f2b295f20ad860d567fbd1..bb1efd53349ffe6afed7e3d2ca20b59d1a04d734 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,14 +19,14 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  nuke.h: Definitions for things having to do with nukes
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
@@ -34,21 +34,34 @@
 #ifndef NUKE_H
 #define NUKE_H
 
+#include <time.h>
+#include "types.h"
+
 #define        N_MAXNUKE       20
+#define        MIN_DRNUKE_CONST        0.001
 
 struct nukstr {
-    /* initial part must match struct genitem */
+    /* initial part must match struct empobj */
     short ef_type;
-    natid nuk_own;
     short nuk_uid;
-    coord nuk_x;               /* current loc of device */
-    coord nuk_y;
-    /* end of part matching struct genitem */
-    s_char nuk_n;              /* number of nukes in list */
-    short nuk_ship;            /* currently aboard ship (unused) */
-    short nuk_trade;           /* index into trade file (unused) */
-    short nuk_types[N_MAXNUKE];        /* # of nukes in sector of given type */
+    unsigned nuk_seqno;
+    unsigned nuk_generation;
     time_t nuk_timestamp;      /* Last time this nuke was touched */
+    natid nuk_own;
+    coord nuk_x, nuk_y;                /* current loc of device */
+    signed char nuk_type;      /* index in nchr[] */
+    signed char nuk_effic;     /* unused, always 100% */
+    signed char nuk_mobil;     /* unused, always 0 */
+    unsigned char nuk_off;     /* repairs stopped? (unused) */
+    short nuk_tech;            /* nuke's tech level */
+    char nuk_stockpile;                /* group membership, unused */
+    coord nuk_opx, nuk_opy;    /* Op sector coords, unused */
+    short nuk_mission;         /* mission code, unused */
+    short nuk_radius;          /* mission radius, unused */
+    /* end of part matching struct empobj */
+    short nuk_ship;            /* currently aboard ship (unused) */
+    short nuk_plane;           /* currently aboard plane */
+    short nuk_land;            /* currently aboard land (unused) */
 };
 
 struct nchrstr {
@@ -63,16 +76,14 @@ struct nchrstr {
     int n_tech;                        /* tech needed to build */
     int n_weight;
     int n_flags;               /* description of capability */
+    signed char n_type;                /* index in nchr[] */
 };
 
 #define        N_NEUT  bit(0)          /* Neutron bomb (low damage, high fallout) */
 
-#define getnuke(n, p) \
-       ef_read(EF_NUKE, n, p)
-#define putnuke(n, p) \
-       ef_write(EF_NUKE, n, p)
-#define getnukep(n) \
-       (struct nukstr *) ef_ptr(EF_NUKE, n)
+#define getnuke(n, p) ef_read(EF_NUKE, (n), (p))
+#define putnuke(n, p) ef_write(EF_NUKE, (n), (p))
+#define getnukep(n) ((struct nukstr *)ef_ptr(EF_NUKE, (n)))
 
 /* Work required for building */
 #define NUK_BLD_WORK(lcm, hcm, oil, rad) \
@@ -80,4 +91,8 @@ struct nchrstr {
 
 extern struct nchrstr nchr[N_MAXNUKE + 1];
 
+/* src/lib/common/cargo.c */
+extern void nuk_carrier_change(struct nukstr *, int, int, int);
+extern int nuk_on_plane(struct plnstr *);
+
 #endif