empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sectors need space for items, deliveries and distribution thresholds.

Browse source 
To save space, the ancients invented `variables': a collection of
key-value pairs, missing means zero value, space for `enough' keys.
This complicates the code, as assigning to a `variable' can fail for
lack of space.  Over time, `enough' increased, and for quite some time
now `variables' have been *wasting* space.  This changeset replaces
them, except in struct mchrstr, struct lchrstr and struct pchrstr,
where they are read-only, and will be replaced later.  It is only a
first step; further cleanup is required.  To simplify and minimize
this necessarily huge changeset, the new item[] arrays have an unused
slot 0, and the old variable types V_CIVIL, ... are still defined, but
must have the same values as the item types I_CIVIL, ...
This commit is contained in:
Markus Armbruster 2004-03-03 16:54:22 +00:00
parent ba86513b01
commit eccc5cb7d7
86 changed files with 853 additions and 1226 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/lib/commands/cuto.c
View file

@ -50,7 +50,6 @@ cuto(void)
int n;
struct nstr_sect nstr;
s_char dirstr[12];
int del[I_MAX + 1];
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
@ -71,37 +70,36 @@ cuto(void)
}
if (player->god)
pr("%3d", sect.sct_own);
getvec(VT_DEL, del, (s_char *)&sect, EF_SECTOR);
pr("%7s", xyas(nstr.x, nstr.y, player->cnum));
pr(" %c ", dchr[sect.sct_type].d_mnem);
pr("%c", dirstr[del[I_CIVIL] & 0x7]);
pr("%c", dirstr[del[I_MILIT] & 0x7]);
pr("%c", dirstr[del[I_UW] & 0x7]);
pr("%c", dirstr[del[I_FOOD] & 0x7]);
pr("%c", dirstr[del[I_SHELL] & 0x7]);
pr("%c", dirstr[del[I_GUN] & 0x7]);
pr("%c", dirstr[del[I_PETROL] & 0x7]);
pr("%c", dirstr[del[I_IRON] & 0x7]);
pr("%c", dirstr[del[I_DUST] & 0x7]);
pr("%c", dirstr[del[I_BAR] & 0x7]);
pr("%c", dirstr[del[I_OIL] & 0x7]);
pr("%c", dirstr[del[I_LCM] & 0x7]);
pr("%c", dirstr[del[I_HCM] & 0x7]);
pr("%c", dirstr[del[I_RAD] & 0x7]);
pr("%4d", del[I_CIVIL] & ~0x7);
pr("%4d", del[I_MILIT] & ~0x7);
pr("%4d", del[I_UW] & ~0x7);
pr("%4d", del[I_FOOD] & ~0x7);
pr("%4d", del[I_SHELL] & ~0x7);
pr("%4d", del[I_GUN] & ~0x7);
pr("%4d", del[I_PETROL] & ~0x7);
pr("%4d", del[I_IRON] & ~0x7);
pr("%4d", del[I_DUST] & ~0x7);
pr("%4d", del[I_BAR] & ~0x7);
pr("%4d", del[I_OIL] & ~0x7);
pr("%4d", del[I_LCM] & ~0x7);
pr("%4d", del[I_HCM] & ~0x7);
pr("%4d", del[I_RAD] & ~0x7);
pr("%c", dirstr[sect.sct_del[I_CIVIL] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_MILIT] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_UW] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_FOOD] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_SHELL] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_GUN] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_PETROL] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_IRON] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_DUST] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_BAR] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_OIL] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_LCM] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_HCM] & 0x7]);
pr("%c", dirstr[sect.sct_del[I_RAD] & 0x7]);
pr("%4d", sect.sct_del[I_CIVIL] & ~0x7);
pr("%4d", sect.sct_del[I_MILIT] & ~0x7);
pr("%4d", sect.sct_del[I_UW] & ~0x7);
pr("%4d", sect.sct_del[I_FOOD] & ~0x7);
pr("%4d", sect.sct_del[I_SHELL] & ~0x7);
pr("%4d", sect.sct_del[I_GUN] & ~0x7);
pr("%4d", sect.sct_del[I_PETROL] & ~0x7);
pr("%4d", sect.sct_del[I_IRON] & ~0x7);
pr("%4d", sect.sct_del[I_DUST] & ~0x7);
pr("%4d", sect.sct_del[I_BAR] & ~0x7);
pr("%4d", sect.sct_del[I_OIL] & ~0x7);
pr("%4d", sect.sct_del[I_LCM] & ~0x7);
pr("%4d", sect.sct_del[I_HCM] & ~0x7);
pr("%4d", sect.sct_del[I_RAD] & ~0x7);
pr("\n");
}
if (nsect == 0) {