client: Unbreak standalone build

[empserver] / include / land.h

diff --git a/include/land.h b/include/land.h
index 8282ba58cf1490d921a722fff4fe4254b071d5e2..3052a3279a6256ee7afd4cd90f438bc48b7dfc78 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
  *     Thomas Ruschak, 1992
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2016
+ *     Markus Armbruster, 2004-2020
  */
 
 #ifndef LAND_H
@@ -41,7 +41,6 @@
 #include "retreat.h"
 #include "types.h"
 
-#define LND_TYPE_MAX   30
 #define LAND_MINEFF    10
 #define LAND_MINFIREEFF 40     /* arty must be this effic to fire */
 
@@ -50,7 +49,7 @@ struct lndstr {
     signed ef_type: 8;
     unsigned lnd_seqno: 12;
     unsigned lnd_generation: 12;
-    int lnd_uid;               /* unit id (land #) */
+    int lnd_uid;               /* unit ID (land #) */
     time_t lnd_timestamp;      /* Last time this unit was touched */
     natid lnd_own;             /* owner's country num */
     coord lnd_x;               /* x location in abs coords */
@@ -65,7 +64,7 @@ struct lndstr {
     short lnd_mission;         /* mission code */
     short lnd_radius;          /* mission radius */
     /* end of part matching struct empobj */
-    int lnd_ship;              /* uid of transporting ship, or -1 */
+    int lnd_ship;              /* UID of transporting ship, or -1 */
     signed char lnd_harden;    /* fortification */
     short lnd_retreat;         /* retreat percentage */
     int lnd_rflags;            /* When do I retreat? */
@@ -73,8 +72,8 @@ struct lndstr {
     unsigned char lnd_scar;    /* how experienced the unit is (not used) */
     short lnd_item[I_MAX+1];   /* amount of items on board */
     short lnd_pstage;          /* plague stage */
-    short lnd_ptime;           /* how many etus remain in this stage */
-    int lnd_land;              /* uid of transporting land unit, or -1 */
+    short lnd_ptime;           /* how many ETUs remain in this stage */
+    int lnd_land;              /* UID of transporting land unit, or -1 */
     short lnd_access;          /* Last tick mob was updated (MOB_ACCESS) */
 };
 
@@ -97,7 +96,7 @@ struct lchrstr {
     int l_acc;                 /* firing accuracy */
     int l_dam;                 /* # of guns firing */
     int l_ammo;                        /* firing ammu used per shot */
-    int l_aaf;                 /* aa fire */
+    int l_aaf;                 /* AA fire */
     int l_flags;               /* what special things can this unit do */
     unsigned char l_nxlight;   /* maximum number of xlight planes */
     unsigned char l_nland;     /* maximum number of units */
@@ -125,7 +124,8 @@ struct lchrstr {
 #define putland(n, p) ef_write(EF_LAND, (n), (p))
 #define getlandp(n) ((struct lndstr *)ef_ptr(EF_LAND, (n)))
 
-extern struct lchrstr lchr[LND_TYPE_MAX + 2];
+#define LCHR_SZ 128
+extern struct lchrstr lchr[LCHR_SZ];
 
 enum {
     LND_AIROPS_EFF = 50                /* min. efficiency for air ops */