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/demo.c
View file

@ -95,11 +95,11 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
while (nxtsct(&nstr, &sect)) {
if (!player->owner || sect.sct_effic < 60)
continue;
if ((mil = getvar(V_MILIT, (s_char *)&sect, EF_SECTOR)) == 0)
if ((mil = sect.sct_item[I_MILIT]) == 0)
continue;
if (sect.sct_own != sect.sct_oldown)
continue;
civ = getvar(V_CIVIL, (s_char *)&sect, EF_SECTOR);
civ = sect.sct_item[I_CIVIL];
if (number < 0) {
if ((deltamil = mil + number) <= 0)
continue;
@ -117,8 +117,8 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
deltamil, xyas(sect.sct_x, sect.sct_y, player->cnum), mil);
if (*p == 'y')
reserves += deltamil;
putvar(V_MILIT, mil, (s_char *)&sect, EF_SECTOR);
putvar(V_CIVIL, civ, (s_char *)&sect, EF_SECTOR);
sect.sct_item[I_MILIT] = mil;
sect.sct_item[I_CIVIL] = civ;
putsect(&sect);
}
if (!for_real)