Store uids as int to support more sectors and units

[empserver] / include / ship.h

diff --git a/include/ship.h b/include/ship.h
index 21e749f589412605affa408e24d725b7075aaa9b..a0b325d38e1b46805933ccf87eace31d4f9e6982 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -32,7 +32,7 @@
  *     Thomas Ruschak, 1992
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2009
  */
 
 #ifndef SHIP_H
@@ -64,7 +64,7 @@
 struct shpstr {
     /* initial part must match struct empobj */
     short ef_type;
-    short shp_uid;             /* unit id (ship #) */
+    int shp_uid;               /* unit it (ship #) */
     unsigned shp_seqno;
     time_t shp_timestamp;      /* Last time this ship was touched. */
     natid shp_own;             /* owner's country num */
@@ -93,7 +93,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 +127,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 */