From 4e895465df7aa5ddcc741188398059e710f2dec1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 30 Dec 2009 13:49:41 +0100 Subject: [PATCH] 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. --- include/land.h | 1 - include/loan.h | 1 - include/nuke.h | 2 -- include/treaty.h | 1 - src/lib/commands/buil.c | 3 +-- 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/land.h b/include/land.h index ae6e68efc..2da78f6bd 100644 --- 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 f4f900f7c..f0a8416ad 100644 --- 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 231f0a045..ccefbe233 100644 --- 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 0e164eef5..bef96d599 100644 --- 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 03720b817..9ebe6f6ee 100644 --- 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); -- 2.43.0