Extend the common header of struct empobj to include uid

[empserver] / include / plane.h

diff --git a/include/plane.h b/include/plane.h
index aba9efb1f88bf8524672e87a4acf4880de06a340..f072ba785abd8d5e79061b4b0b72e20f39c74978 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-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -46,8 +46,8 @@
 struct plnstr {
     /* initial part must match struct empobj */
     short ef_type;
-    natid pln_own;             /* owning country */
     short pln_uid;             /* plane unit id */
+    natid pln_own;             /* owning country */
     coord pln_x;               /* plane x-y */
     coord pln_y;
     signed char pln_type;      /* index in plchr[] */
@@ -73,7 +73,7 @@ struct plnstr {
     signed char pln_harden;    /* for missiles */
     signed char pln_nuketype;  /* type of nuclear armament (if any) */
     signed char pln_flags;     /* State of the plane */
-    time_t pln_access;         /* Last time mob was updated (MOB_ACCESS) */
+    short pln_access;          /* Last tick mob was updated (MOB_ACCESS) */
     time_t pln_timestamp;      /* Last time this plane was touched */
     float pln_theta;           /* position in orbital sine wave */
 };
@@ -137,7 +137,7 @@ struct plist {
 
 #define getplane(n, p) ef_read(EF_PLANE, (n), (p))
 #define putplane(n, p) ef_write(EF_PLANE, (n), (p))
-#define getplanep(n) (struct plnstr *)ef_ptr(EF_PLANE, (n))
+#define getplanep(n) ((struct plnstr *)ef_ptr(EF_PLANE, (n)))
 
 extern struct plchrstr plchr[PLN_TYPE_MAX + 2];