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

14
src/lib/subs/supply.c
View file

@ -49,8 +49,8 @@
#include "player.h"
#include "prototypes.h"
static int get_minimum(struct lndstr *, int);
static int s_commod(int, int, int, int, int, int);
static int get_minimum(struct lndstr *, i_type);
static int s_commod(int, int, int, i_type, int, int);
/*
* We want to get enough guns to be maxed out, enough shells to
@ -84,7 +84,7 @@ resupply_all(struct lndstr *lp)
*/
void
resupply_commod(struct lndstr *lp, int type)
resupply_commod(struct lndstr *lp, i_type type)
{
int amt;
struct lchrstr *lcp;
@ -131,7 +131,7 @@ resupply_commod(struct lndstr *lp, int type)
* Actually get the commod
*/
int
supply_commod(int own, int x, int y, int type, int total_wanted)
supply_commod(int own, int x, int y, i_type type, int total_wanted)
{
if (total_wanted < 0)
return 0;
@ -142,7 +142,7 @@ supply_commod(int own, int x, int y, int type, int total_wanted)
* Just return the number you COULD get, without doing it
*/
int
try_supply_commod(int own, int x, int y, int type, int total_wanted)
try_supply_commod(int own, int x, int y, i_type type, int total_wanted)
{
if (total_wanted < 0)
return 0;
@ -152,7 +152,7 @@ try_supply_commod(int own, int x, int y, int type, int total_wanted)
/* Get supplies of a certain type */
static int
s_commod(int own, int x, int y, int type, int total_wanted,
s_commod(int own, int x, int y, i_type type, int total_wanted,
int actually_doit)
{
int wanted = total_wanted;
@ -433,7 +433,7 @@ s_commod(int own, int x, int y, int type, int total_wanted,
*/
static int
get_minimum(struct lndstr *lp, int type)
get_minimum(struct lndstr *lp, i_type type)
{
struct lchrstr *lcp;
int max, want = 0;