Store sequence numbers more compactly

[empserver] / include / plane.h

diff --git a/include/plane.h b/include/plane.h
index 7b1936a639d4c8a26b1695c6157dc334f5dc528d..e77ee93acef4438ffab683ae145d9d20cd73b850 100644 (file)
--- a/include/plane.h
+++ b/include/plane.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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,12 +26,12 @@
  *  ---
  *
  *  plane.h: Definitions for planes and plane types
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2009
  */
 
 #ifndef PLANE_H
@@ -46,8 +46,9 @@
 
 struct plnstr {
     /* initial part must match struct empobj */
-    short ef_type;
-    short pln_uid;             /* plane unit id */
+    signed ef_type: 8;
+    unsigned pln_seqno: 12;
+    int pln_uid;               /* unit id (plane #) */
     time_t pln_timestamp;      /* Last time this plane was touched */
     natid pln_own;             /* owning country */
     coord pln_x;               /* plane x-y */
@@ -64,16 +65,15 @@ struct plnstr {
     short pln_radius;          /* mission radius */
     /* end of part matching struct empobj */
     unsigned char pln_range;   /* total distance, not radius */
-    short pln_ship;            /* pointer to carrier */
-    short pln_land;            /* pointer to carrier */
+    int pln_ship;              /* uid of carrier, or -1 */
+    int pln_land;              /* uid of transporting land unit, or -1 */
     signed char pln_harden;    /* for missiles */
-    signed char pln_nuketype;  /* type of nuclear armament (if any) */
     signed char pln_flags;     /* State of the plane */
     short pln_access;          /* Last tick mob was updated (MOB_ACCESS) */
     float pln_theta;           /* position in orbital sine wave */
 };
 
-#define        PLN_LAUNCHED    bit(0)  /* A satellite that's in orbit */
+#define        PLN_LAUNCHED    bit(0)  /* Flying (satellite: in orbit) */
 #define        PLN_SYNCHRONOUS bit(1)  /* A satellite in geo-synchronous orbit */
 #define        PLN_AIRBURST    bit(2)  /* Airburst the nuke we're armed with */
 
@@ -105,9 +105,9 @@ struct plchrstr {
 #define P_S    bit(7)          /* Spy ability */
 #define P_I    bit(8)          /* Imaging ability (advanced spying) */
 #define P_O    bit(9)          /* Orbital ability (a satellite) */
-#define P_X    bit(10)         /* Stealth ability */
+/* unused      bit(10) */
 #define P_N    bit(11)         /* Nuclear RV interceptor (abm) */
-#define        P_H     bit(12)         /* Half stealthy */
+/* unused      bit(12) */
 #define P_E    bit(13)         /* extra light */
 #define P_K    bit(14)         /* chopper */
 #define P_A    bit(15)         /* ASW (Anti-Sub Warfare) */
@@ -124,8 +124,7 @@ struct plchrstr {
 
 struct plist {
     struct emp_qelem queue;    /* list of planes */
-    int bombs;                 /* bombs carried for bombing mission */
-    int misc;                  /* amount of random item being transported */
+    int load;                  /* number of bombs or items carried */
     struct plchrstr *pcp;      /* pointer to desc of plane */
     struct plnstr plane;       /* struct plane */
 };
@@ -137,7 +136,7 @@ struct plist {
 extern struct plchrstr plchr[PLN_TYPE_MAX + 2];
 
 struct shiplist {
-    short uid;
+    int uid;
     struct shiplist *next;
 };
 
@@ -155,20 +154,20 @@ extern int pln_acc(struct plnstr *);
 extern int pln_range_max(struct plnstr *);
 extern int pln_load(struct plnstr *);
 
+/* src/lib/common/cargo.c */
+extern void pln_carrier_change(struct plnstr *, int, int, int);
+extern int pln_first_on_ship(struct shpstr *);
+extern int pln_first_on_land(struct lndstr *);
+extern int pln_next_on_unit(int);
+
 /* src/lib/subs/aircombat.c */
-extern void ac_combat_headers(natid, natid);
-extern void ac_airtoair(struct emp_qelem *, struct emp_qelem *);
 extern int ac_flak_dam(int, int, int);
 extern void ac_encounter(struct emp_qelem *, struct emp_qelem *, coord,
-                        coord, char *, int, int,
-                        struct emp_qelem *, struct emp_qelem *);
-extern int ac_isflying(struct plnstr *, struct emp_qelem *);
-extern void sam_intercept(struct emp_qelem *, struct emp_qelem *,
-                         natid, natid, coord, coord, int);
+                        coord, char *, int);
 
 /* src/lib/subs/aswplnsubs.c */
-extern int on_shiplist(short, struct shiplist *);
-extern void add_shiplist(short, struct shiplist **);
+extern int on_shiplist(int, struct shiplist *);
+extern void add_shiplist(int, struct shiplist **);
 extern void free_shiplist(struct shiplist **);
 extern void print_shiplist(struct shiplist *);