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

15
src/lib/update/nav_util.c
View file

@ -82,16 +82,17 @@ check_nav(struct sctstr *sect)
* Chad Zabel 6/1/94
*/
int
load_it(register struct shpstr *sp, register struct sctstr *psect, int i)
load_it(struct shpstr *sp, struct sctstr *psect, int i)
{
int comm, shipown, amount, ship_amt, sect_amt;
int shipown, amount, ship_amt, sect_amt;
int abs_max, max_amt, transfer;
i_type comm;
struct mchrstr *vship;
amount = sp->shp_lend[i];
shipown = sp->shp_own;
comm = sp->shp_tend[i];
if (CANT_HAPPEN((unsigned)comm > I_MAX))
if (CANT_HAPPEN(comm <= I_NONE || comm > I_MAX))
return 0;
ship_amt = sp->shp_item[comm];
@ -157,13 +158,13 @@ load_it(register struct shpstr *sp, register struct sctstr *psect, int i)
* Chad Zabel 6/1/94
*/
void
unload_it(register struct shpstr *sp)
unload_it(struct shpstr *sp)
{
struct sctstr *sectp;
int i;
int landowner;
int shipown;
int comm;
i_type comm;
int sect_amt;
int ship_amt;
int max_amt;
@ -182,7 +183,7 @@ unload_it(register struct shpstr *sp)
continue;
comm = sp->shp_tend[i];
if (CANT_HAPPEN((unsigned)comm > I_MAX))
if (CANT_HAPPEN(comm <= I_NONE || comm > I_MAX))
continue;
ship_amt = sp->shp_item[comm];
sect_amt = sectp->sct_item[comm];
@ -221,7 +222,7 @@ unload_it(register struct shpstr *sp)
*/
void
auto_fuel_ship(register struct shpstr *sp)
auto_fuel_ship(struct shpstr *sp)
{
double d;
int totalfuel = 0;