Update copyright notice

[empserver] / include / nuke.h

diff --git a/include/nuke.h b/include/nuke.h
index 9f6caba17f0fdd7353ad1d97ee60aec5f98ef214..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-2008, 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/>.
  *
  *  ---
  *
@@ -37,14 +36,15 @@
 #include <time.h>
 #include "types.h"
 
-#define        N_MAXNUKE       20
-#define        MIN_DRNUKE_CONST        0.001
+#define N_MAXNUKE      20
+#define MIN_DRNUKE_CONST       0.001
 
 struct nukstr {
     /* initial part must match struct empobj */
-    short ef_type;
-    short nuk_uid;
-    unsigned nuk_seqno;
+    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;
     coord nuk_x, nuk_y;                /* current loc of device */
@@ -53,14 +53,12 @@ struct nukstr {
     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 empobj */
-    short nuk_ship;            /* currently aboard ship (unused) */
-    short nuk_plane;           /* currently aboard plane */
-    short nuk_land;            /* currently aboard land (unused) */
+    int nuk_plane;             /* uid of transporting plane, or -1 */
 };
 
 struct nchrstr {
@@ -78,7 +76,7 @@ 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))