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

8
src/lib/commands/thre.c
View file

@ -63,7 +63,7 @@ thre(void)
return RET_SYN;
if (!snxtsct(&nstr, player->argp[2]))
return RET_SYN;
type = V_DIST(ip->i_vtype & (~VT_TYPE));
type = ip->i_vtype;
if (player->argp[3] && *player->argp[3] &&
(*player->argp[3] < '0' || *player->argp[3] > '9')) {
pr("Threshold must be a number\n");
@ -72,7 +72,7 @@ thre(void)
while (!player->aborted && nxtsct(&nstr, &sect)) {
if (!player->owner)
continue;
val = getvar(type, (s_char *)&sect, EF_SECTOR);
val = sect.sct_dist[type];
if (val > 0)
sprintf(prompt, "%s %s old threshold %d new? ",
xyas(nstr.x, nstr.y, player->cnum),
@ -98,9 +98,7 @@ thre(void)
if (val > 0 && (player->argp[3] != 0 && *player->argp[3] != 0))
pr("%s old threshold %d\n",
xyas(nstr.x, nstr.y, player->cnum), val);
if (putvar(type, thresh, (s_char *)&sect, EF_SECTOR) < 0)
pr("No room for threshold in %s\n",
xyas(nstr.x, nstr.y, player->cnum));
sect.sct_dist[type] = thresh;
putsect(&sect);
}
return RET_OK;