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

11
src/lib/commands/mark.c
View file

@ -92,14 +92,14 @@ pr_mark(struct comstr *comm)
}
int
display_mark(int only_itype, int only_cheapest)
display_mark(i_type only_itype, int only_cheapest)
{
struct comstr comm;
struct comstr comm2;
int sellers = 0;
int cnt = 0;
int cheapest_items[I_MAX + 1];
int i;
i_type i;
/* Execute trades so report lists only lots that are still available. */
check_market();
@ -111,12 +111,13 @@ display_mark(int only_itype, int only_cheapest)
pr(" --- ------------- -- --------- ----- ---- ------ ------\n");
if (only_cheapest) {
for (i = 0; i < I_MAX + 1; i++)
for (i = I_NONE + 1; i <= I_MAX; i++)
cheapest_items[i] = -1;
for (sellers = 0; getcomm(sellers, &comm); sellers++) {
if (comm.com_owner == 0)
continue;
if (CANT_HAPPEN((unsigned)comm.com_type > I_MAX))
if (CANT_HAPPEN(comm.com_type <= I_NONE
|| comm.com_type > I_MAX))
continue;
if (cheapest_items[comm.com_type] != -1) {
getcomm(cheapest_items[comm.com_type], &comm2);
@ -128,7 +129,7 @@ display_mark(int only_itype, int only_cheapest)
}
}
CANT_HAPPEN(only_itype != I_NONE); /* not implemented */
for (i = 0; i < I_MAX + 1; i++) {
for (i = I_NONE + 1; i <= I_MAX; i++) {
if (cheapest_items[i] == -1)
continue;
getcomm(cheapest_items[i], &comm);