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/global/nsc.c
View file

@ -141,8 +141,8 @@ struct castr ship_ca[] = {
{NSC_XCOORD, 0, 0, fldoff(shpstr, shp_destx[1]), "xend"},
{NSC_YCOORD, 0, 0, fldoff(shpstr, shp_desty[0]), "ystart"},
{NSC_YCOORD, 0, 0, fldoff(shpstr, shp_desty[1]), "yend"},
{NSC_CHAR, 0, TMAX, fldoff(shpstr, shp_tstart), "cargostart"},
{NSC_CHAR, 0, TMAX, fldoff(shpstr, shp_tend), "cargoend"},
{NSC_SITYPE(i_type), 0, TMAX, fldoff(shpstr, shp_tstart), "cargostart"},
{NSC_SITYPE(i_type), 0, TMAX, fldoff(shpstr, shp_tend), "cargoend"},
{NSC_SHORT, 0, TMAX, fldoff(shpstr, shp_lstart), "amtstart"},
{NSC_SHORT, 0, TMAX, fldoff(shpstr, shp_lend), "amtend"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_autonav), "autonav"},
@ -279,7 +279,7 @@ struct castr lost_ca[] = {
struct castr commodity_ca[] = {
{NSC_NATID, 0, 0, fldoff(comstr, com_owner), "owner"},
{NSC_SHORT, 0, 0, fldoff(comstr, com_uid), "uid"},
{NSC_INT, 0, 0, fldoff(comstr, com_type), "type"},
{NSC_SITYPE(i_type), 0, 0, fldoff(comstr, com_type), "type"},
{NSC_INT, 0, 0, fldoff(comstr, com_amount), "amount"},
{NSC_INT, 0, 0, fldoff(comstr, com_maxbidder), "maxbidder"},
{NSC_TIME, 0, 0, fldoff(comstr, com_markettime), "markettime"},