(I_NONE, I_CIVIL, I_MILIT, I_SHELL, I_GUN, I_PETROL, I_IRON, I_DUST,
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:
parent
308430e751
commit
d30942632b
38 changed files with 143 additions and 134 deletions
|
@ -61,7 +61,7 @@ move(void)
|
|||
int left;
|
||||
int mcost, dam;
|
||||
int infected;
|
||||
int vtype;
|
||||
i_type vtype;
|
||||
int amt_src;
|
||||
int amt_dst;
|
||||
struct ichrstr *ip;
|
||||
|
@ -347,7 +347,7 @@ cmd_move_map(s_char *what, coord curx, coord cury, s_char *arg)
|
|||
}
|
||||
|
||||
int
|
||||
want_to_abandon(struct sctstr *sp, int vtype, int amnt, struct lndstr *lp)
|
||||
want_to_abandon(struct sctstr *sp, i_type vtype, int amnt, struct lndstr *lp)
|
||||
{
|
||||
char prompt[80];
|
||||
|
||||
|
@ -368,7 +368,7 @@ want_to_abandon(struct sctstr *sp, int vtype, int amnt, struct lndstr *lp)
|
|||
}
|
||||
|
||||
int
|
||||
would_abandon(struct sctstr *sp, int vtype, int amnt, struct lndstr *lp)
|
||||
would_abandon(struct sctstr *sp, i_type vtype, int amnt, struct lndstr *lp)
|
||||
{
|
||||
int mil, civs, loyalcivs;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue