Update copyright notice

[empserver] / include / plane.h

diff --git a/include/plane.h b/include/plane.h
index f1d61e94dd8af5763499ebc1203d5e6831b6673e..fe2e670e8aa943f9f7c885d851ffac51a2bb78fe 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-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,13 +30,14 @@
  *     Dave Pare, 1986
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2010
+ *     Markus Armbruster, 2004-2016
  */
 
 #ifndef PLANE_H
 #define PLANE_H
 
-#include <time.h>
+#include "file.h"
+#include "item.h"
 #include "queue.h"
 #include "types.h"
 
@@ -65,10 +66,10 @@ struct plnstr {
     short pln_radius;          /* mission radius */
     /* end of part matching struct empobj */
     unsigned char pln_range;   /* total distance, not radius */
+    signed char pln_harden;    /* for missiles */
     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 */
+    int pln_flags;             /* State of the plane */
     short pln_access;          /* Last tick mob was updated (MOB_ACCESS) */
     float pln_theta;           /* position in orbital sine wave */
 };
@@ -79,16 +80,16 @@ struct plnstr {
 
 struct plchrstr {
     char *pl_name;             /* full name of type of plane */
-    int pl_lcm;                        /* costs to build */
-    int pl_hcm;
-    int pl_cost;
+    short pl_mat[I_MAX+1];     /* materials to build 100% */
+                               /* only I_LCM, I_HCM, I_MILIT non-zero */
+    int pl_bwork;              /* work to build 100% */
     int pl_tech;               /* tech needed to build */
+    int pl_cost;               /* how much it costs to build */
     int pl_acc;                        /* bombing accuracy (higher the better) */
     int pl_load;               /* bomb load, also for carrying cargo */
     int pl_att;                        /* air-air attack/defense strengths */
     int pl_def;
     int pl_range;              /* how many sectors it can fly */
-    int pl_crew;               /* number of mil to crew it */
     int pl_fuel;               /* fuel consumption */
     int pl_stealth;            /* how stealthy is it? */
     int pl_flags;              /* description of capability */
@@ -125,6 +126,7 @@ struct plchrstr {
 struct plist {
     struct emp_qelem queue;    /* list of planes */
     int load;                  /* number of bombs or items carried */
+    short pstage;              /* plague stage */
     struct plchrstr *pcp;      /* pointer to desc of plane */
     struct plnstr plane;       /* struct plane */
 };
@@ -140,9 +142,6 @@ struct shiplist {
     struct shiplist *next;
 };
 
-/* Work required for building 100% */
-#define PLN_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))
-
 extern int pl_att(struct plchrstr *, int);
 extern int pl_def(struct plchrstr *, int);
 extern int pl_acc(struct plchrstr *, int);
@@ -170,6 +169,5 @@ extern int ac_damage_plane(struct plnstr *, natid, int, int, char *);
 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 *);
 
 #endif