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 3f556c33792e358156142ff0871894e4df018e74..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-2006, 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
@@ -36,33 +36,31 @@
 #ifndef PLANE_H
 #define PLANE_H
 
+#include <time.h>
 #include "queue.h"
-#include "sect.h"
+#include "types.h"
 
-#define N_MAXPLANE     40
+#define PLN_TYPE_MAX   46
 #define        PLANE_MINEFF    10
 
-/*
- * some routines assume that from pln_x to pln_wing remains
- * exactly equivalent with shp_x to shp_fleet
- */
 struct plnstr {
-    /* initial part must match struct genitem */
+    /* 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;
-    s_char pln_type;           /* index in plchr[] */
-    s_char pln_effic;          /* actually "training" */
-    s_char pln_mobil;          /* plane mobility */
+    signed char pln_type;      /* index in plchr[] */
+    signed char pln_effic;     /* actually "training" */
+    signed char pln_mobil;     /* plane mobility */
+    unsigned char pln_off;     /* repairs stopped? */
     short pln_tech;            /* plane's tech level */
-    s_char pln_wing;           /* like fleet */
+    char pln_wing;             /* like fleet */
     coord pln_opx;             /* Op sector coords */
     coord pln_opy;             /* Op sector coords */
     short pln_mission;         /* mission code */
     short pln_radius;          /* mission radius */
-    /* end of part matching struct genitem */
+    /* end of part matching struct empobj */
     unsigned char pln_range;   /* total distance, not radius */
     unsigned char pln_range_max; /* max range for this plane */
     short pln_ship;            /* pointer to carrier */
@@ -72,10 +70,10 @@ struct plnstr {
     int pln_acc;
     int pln_load;
     int pln_fuel;              /* (unused) */
-    s_char pln_harden;         /* for missiles */
-    s_char pln_nuketype;       /* type of nuclear armament (if any) */
-    s_char pln_flags;          /* State of the plane */
-    time_t pln_access;         /* Last time mob was updated (MOB_ACCESS) */
+    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) */
     time_t pln_timestamp;      /* Last time this plane was touched */
     float pln_theta;           /* position in orbital sine wave */
 };
@@ -137,14 +135,11 @@ struct plist {
     struct plnstr plane;       /* struct plane */
 };
 
-#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 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)))
 
-extern struct plchrstr plchr[N_MAXPLANE + 1];
+extern struct plchrstr plchr[PLN_TYPE_MAX + 2];
 
 struct shiplist {
     short uid;
@@ -152,35 +147,24 @@ struct shiplist {
 };
 
 #define PLN_ATTDEF(b, t) (b + ((b?1:0) * ((t/20)>10?10:(t/20))))
-#define PLN_ACC(b, t) (b * (1.0 - (sqrt((double)t) / 50.)))
-#define PLN_RAN(b, t) (t ? (b + (logx((double)t, (double)2.0))) : b)
-#define PLN_LOAD(b, t) (t ? (b * (logx((double)t, (double)50.0) < 1.0 ? 1.0 : \
-                                 logx((double)t, (double)50.0))) : b)
+#define PLN_ACC(b, t) (b * (1.0 - (sqrt(t) / 50.)))
+#define PLN_RAN(b, t) (t ? (b + (logx(t, 2.0))) : b)
+#define PLN_LOAD(b, t) (t ? (b * (logx(t, 50.0) < 1.0 ? 1.0 : \
+                                 logx(t, 50.0))) : b)
 
 /* Work required for building 100% */
 #define PLN_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))
 
 /* src/lib/subs/aircombat.c */
-extern void ac_planedamage(struct plist *, natid, int, natid, int,
-                          int, char *);
-extern void ac_intercept(struct emp_qelem *, struct emp_qelem *,
-                        struct emp_qelem *, natid, coord, coord);
 extern void ac_combat_headers(natid, natid);
 extern void ac_airtoair(struct emp_qelem *, struct emp_qelem *);
-extern void ac_doflak(struct emp_qelem *, struct sctstr *);
-extern void ac_shipflak(struct emp_qelem *, coord, coord);
-extern void ac_landflak(struct emp_qelem *, coord, coord);
-extern void ac_fireflak(struct emp_qelem *, natid, natid, int);
-extern int ac_flak_dam(int);
+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 int do_evade(struct emp_qelem *, struct emp_qelem *);
 extern void sam_intercept(struct emp_qelem *, struct emp_qelem *,
                          natid, natid, coord, coord, int);
-extern int all_missiles(struct emp_qelem *);
-extern int can_fly(int);
 
 /* src/lib/subs/aswplnsubs.c */
 extern int on_shiplist(short, struct shiplist *);