empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Markus Armbruster 2009-12-30 13:49:41 +01:00
parent d8c940ec2c
commit 4e895465df
5 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/land.h
View file

@ -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 */

1
include/loan.h
View file

@ -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 */

2
include/nuke.h
View file

@ -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 {

1
include/treaty.h
View file

@ -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 */
};

3
src/lib/commands/buil.c
View file

@ -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);