Update copyright notice

[empserver] / include / nuke.h

diff --git a/include/nuke.h b/include/nuke.h
index 9abed3d113da4112c54a65f1abb607977bc76373..a92d2b614b8bc127f3abaa0fc88c08c2eadce7a5 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  nuke.h: Definitions for things having to do with nukes
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
@@ -34,29 +33,32 @@
 #ifndef NUKE_H
 #define NUKE_H
 
-#define        N_MAXNUKE       20
-#define        MIN_DRNUKE_CONST        0.001
+#include <time.h>
+#include "types.h"
+
+#define N_MAXNUKE      20
+#define MIN_DRNUKE_CONST       0.001
 
 struct nukstr {
-    /* initial part must match struct genitem */
-    short ef_type;
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned nuk_seqno: 12;
+    unsigned nuk_generation: 12;
+    int nuk_uid;               /* unit id (nuke #) */
+    time_t nuk_timestamp;      /* Last time this nuke was touched */
     natid nuk_own;
-    short nuk_uid;
     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 */
+    char nuk_stockpile;                /* group membership */
     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 genitem */
-    short nuk_ship;            /* currently aboard ship (unused) */
-    short nuk_plane;           /* currently aboard plane */
-    short nuk_land;            /* currently aboard land (unused) */
-    time_t nuk_timestamp;      /* Last time this nuke was touched */
+    /* end of part matching struct empobj */
+    int nuk_plane;             /* uid of transporting plane, or -1 */
 };
 
 struct nchrstr {
@@ -74,11 +76,11 @@ struct nchrstr {
     signed char n_type;                /* index in nchr[] */
 };
 
-#define        N_NEUT  bit(0)          /* Neutron bomb (low damage, high fallout) */
+#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 getnukep(n) ((struct nukstr *)ef_ptr(EF_NUKE, (n)))
 
 /* Work required for building */
 #define NUK_BLD_WORK(lcm, hcm, oil, rad) \
@@ -86,4 +88,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