Remove unused members of struct lndstr, lonstr, nukstr, trtstr

struct lndstr member lnd_flags is a leftover from Empire3's C_SYNC,
which was ripped out in 4.0.0.

struct lonstr member l_sel, struct nuk_str members nuk_ship, nuk_land,
and struct trtstr member trt_bond have been there basically forever
without any use.

diff --git a/include/land.h b/include/land.h
index ae6e68efc952689510dbb2866a92c8335e09e247..2da78f6bde39a320c08b68a1b9ac4c408b9729e0 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -66,7 +66,6 @@ struct lndstr {
     short lnd_mission;         /* mission code */
     short lnd_radius;          /* mission radius */
     /* end of part matching struct empobj */
-    signed char lnd_flags;     /* unit flags (unused) */
     short lnd_ship;            /* pointer to transporting ship */
     signed char lnd_harden;    /* fortification */
     short lnd_retreat;         /* retreat percentage */

diff --git a/include/loan.h b/include/loan.h
index f4f900f7c80b1dd28ef263448b77cc3713a3fe9d..f0a8416adeb1024db422c326318f474c680673c7 100644 (file)
--- a/include/loan.h
+++ b/include/loan.h
@@ -50,7 +50,6 @@ struct lonstr {
     natid l_loner;             /* loan shark */
     natid l_lonee;             /* sucker */
     signed char l_status;      /* loan status */
-    short l_sell;              /* pointer to trade file (unused) */
     int l_irate;               /* interest rate */
     int l_ldur;                        /* intended duration */
     long l_amtpaid;            /* amount paid so far */

diff --git a/include/nuke.h b/include/nuke.h
index 231f0a04578982578a87e3b9483e9c2e4d4436b3..ccefbe23355e773f192e7e72914ca3098988fed3 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -58,9 +58,7 @@ struct nukstr {
     short nuk_mission;         /* mission code, unused */
     short nuk_radius;          /* mission radius, unused */
     /* end of part matching struct empobj */
-    short nuk_ship;            /* currently aboard ship (unused) */
     short nuk_plane;           /* currently aboard plane */
-    short nuk_land;            /* currently aboard land (unused) */
 };
 
 struct nchrstr {

diff --git a/include/treaty.h b/include/treaty.h
index 0e164eef5df1fb8fc2bcf31b7c97e7e0e15b91e5..bef96d5998480fef6cde33b597c5b41e1f0ebe08 100644 (file)
--- a/include/treaty.h
+++ b/include/treaty.h
@@ -50,7 +50,6 @@ struct trtstr {
     char trt_fill;
     short trt_acond;           /* conditions for proposer */
     short trt_bcond;           /* conditions for accepter */
-    float trt_bond;            /* amount of bond involved (unused) */
     time_t trt_exp;            /* expiration date */
 };
 

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 03720b81717ae3cb8d43f82cd423cbaa443b9414..9ebe6f6ee3ea6adc146f67809e9882838da3df76 100644 (file)
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -458,7 +458,6 @@ build_land(struct sctstr *sp, struct lchrstr *lp, short *vec, int tlev)
     } else {
        land.lnd_mobil = 0;
     }
-    land.lnd_flags = 0;
     land.lnd_ship = -1;
     land.lnd_land = -1;
     land.lnd_harden = 0;
@@ -652,7 +651,7 @@ build_nuke(struct sctstr *sp, struct nchrstr *np, short *vec, int tlev)
     nuke.nuk_own = sp->sct_own;
     nuke.nuk_type = np - nchr;
     nuke.nuk_effic = 100;
-    nuke.nuk_ship = nuke.nuk_plane = nuke.nuk_land = -1;
+    nuke.nuk_plane = -1;
     nuke.nuk_tech = tlev;
     unit_wipe_orders((struct empobj *)&nuke);