Update copyright notice

[empserver] / include / ship.h

diff --git a/include/ship.h b/include/ship.h
index c660be29669c05d1b2927dad7a62ac61926fbdbe..f2e4c0fd38b8c49601eba41ca87900f61b118ef8 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,13 +26,13 @@
  *  ---
  *
  *  ship.h: Definitions for things having to do with ships
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare
  *     Thomas Ruschak, 1992
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2009
  */
 
 #ifndef SHIP_H
@@ -63,9 +63,10 @@
 
 struct shpstr {
     /* initial part must match struct empobj */
-    short ef_type;
-    short shp_uid;             /* unit id (ship #) */
-    unsigned shp_seqno;
+    signed ef_type: 8;
+    unsigned shp_seqno: 12;
+    unsigned shp_generation: 12;
+    int shp_uid;               /* unit it (ship #) */
     time_t shp_timestamp;      /* Last time this ship was touched. */
     natid shp_own;             /* owner's country num */
     coord shp_x;               /* x location in abs coords */
@@ -93,7 +94,7 @@ struct shpstr {
     short shp_access;          /* Last tick mob was updated (MOB_ACCESS) */
     unsigned char shp_mobquota;        /* mobility quota */
     char shp_path[MAXSHPPATH];
-    short shp_follow;
+    int shp_follow;
     char shp_name[MAXSHPNAMLEN]; /* name set with the "name" command */
     coord shp_orig_x;
     coord shp_orig_y;          /* Where we were built */
@@ -127,7 +128,7 @@ struct mchrstr {
 #define M_TORP         bit(1)  /* fire torpedoes */
 #define M_DCH          bit(2)  /* drop depth charges on subs */
 #define M_FLY          bit(3)  /* launch and recover planes */
-/* M_MSL will be automatically set in init_global() if m_nplanes > 0
+/* M_MSL will be automatically set in init_mchr() if m_nplanes > 0
    and M_FLY is not set */
 #define M_MSL          bit(4)  /* launch missiles */
 #define M_OIL          bit(5)  /* drill for oil */