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

30
src/lib/commands/leve.c
View file

@ -48,7 +48,6 @@ leve(void)
struct sctstr sect;
int nsect;
struct nstr_sect nstr;
int dist[I_MAX + 1];
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
@ -65,24 +64,23 @@ leve(void)
}
if (player->god)
pr("%2d ", sect.sct_own);
getvec(VT_DIST, dist, (s_char *)&sect, EF_SECTOR);
prxy("%3d,%-3d", nstr.x, nstr.y, player->cnum);
pr(" %c ", dchr[sect.sct_type].d_mnem);
prxy("%3d,%-3d", sect.sct_dist_x, sect.sct_dist_y, player->cnum);
pr(" %4d", dist[I_CIVIL]);
pr("%4d", dist[I_MILIT]);
pr("%4d", dist[I_UW]);
pr("%5d", dist[I_FOOD]);
pr("%4d", dist[I_SHELL]);
pr("%4d", dist[I_GUN]);
pr("%4d", dist[I_PETROL]);
pr("%5d", dist[I_IRON]);
pr("%5d", dist[I_DUST]);
pr("%4d", dist[I_BAR]);
pr("%4d", dist[I_OIL]);
pr("%4d", dist[I_LCM]);
pr("%4d", dist[I_HCM]);
pr("%4d", dist[I_RAD]);
pr(" %4d", sect.sct_dist[I_CIVIL]);
pr("%4d", sect.sct_dist[I_MILIT]);
pr("%4d", sect.sct_dist[I_UW]);
pr("%5d", sect.sct_dist[I_FOOD]);
pr("%4d", sect.sct_dist[I_SHELL]);
pr("%4d", sect.sct_dist[I_GUN]);
pr("%4d", sect.sct_dist[I_PETROL]);
pr("%5d", sect.sct_dist[I_IRON]);
pr("%5d", sect.sct_dist[I_DUST]);
pr("%4d", sect.sct_dist[I_BAR]);
pr("%4d", sect.sct_dist[I_OIL]);
pr("%4d", sect.sct_dist[I_LCM]);
pr("%4d", sect.sct_dist[I_HCM]);
pr("%4d", sect.sct_dist[I_RAD]);
pr("\n");
}
if (nsect == 0) {