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

(I_NONE, I_CIVIL, I_MILIT, I_SHELL, I_GUN, I_PETROL, I_IRON, I_DUST,

Browse source 
I_BAR, I_FOOD, I_OIL, I_LCM, I_HCM, I_UW, I_RAD, I_MAX): Turn macros
into enumeration constants.
(i_type): New.  Use where appropriate.  No functional changes, except
that I_NONE is now catched properly in a few places.
This commit is contained in:
Marc Olzheim 2004-09-16 21:18:01 +00:00
parent 308430e751
commit d30942632b
38 changed files with 143 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/commands/scra.c
View file

@ -63,7 +63,7 @@ scra(void)
struct plchrstr *pp;
struct lchrstr *lp;
s_char *p;
int i;
i_type i;
struct nstr_item ni2;
struct plnstr plane;
struct lndstr land;
@ -187,7 +187,7 @@ scra(void)
}
pr("%s", prship(&item.ship));
/* FIXME obey ITEM_MAX */
for (i = 1; i <= I_MAX; i++) {
for (i = I_NONE + 1; i <= I_MAX; i++) {
sect.sct_item[i] += item.ship.shp_item[i];
}
sect.sct_item[I_LCM] += mp->m_lcm * 2 / 3 * eff;
@ -254,7 +254,7 @@ scra(void)
lp = &lchr[(int)item.land.lnd_type];
pr("%s", prland(&item.land));
/* FIXME obey ITEM_MAX */
for (i = 1; i <= I_MAX; i++) {
for (i = I_NONE + 1; i <= I_MAX; i++) {
sect.sct_item[i] += item.land.lnd_item[i];
}
sect.sct_item[I_LCM] += lp->l_lcm * 2 / 3 * eff;