* Dave Pare, 1986
* Ken Stevens, 1995
* Steve McClure, 1998
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2009
*/
#ifndef PLANE_H
struct plnstr {
/* initial part must match struct empobj */
- short ef_type;
- short pln_uid; /* plane unit id */
- unsigned pln_seqno;
+ 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 */
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_flags; /* State of the plane */
short pln_access; /* Last tick mob was updated (MOB_ACCESS) */
#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) */
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 */
};
extern struct plchrstr plchr[PLN_TYPE_MAX + 2];
struct shiplist {
- short uid;
+ int uid;
struct shiplist *next;
};
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 *);