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

9
src/lib/subs/fortdef.c
View file

@ -112,8 +112,7 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
nshot = min(nshot, ship.shp_glim);
if (nshot <= 0)
continue;
(void)putvar(V_SHELL, vec[I_SHELL] - nshot, (caddr_t)&ship,
EF_SHIP);
ship.shp_item[I_SHELL] = vec[I_SHELL] - nshot;
putship(ship.shp_uid, &ship);
if (defending)
nreport(ship.shp_own, N_FIRE_BACK, att, 1);
@ -254,16 +253,16 @@ sb(natid att, natid def, struct sctstr *sp, coord tx, coord ty, int noisy,
range2 = mapdist((int)sp->sct_x, (int)sp->sct_y, tx, ty);
if (range < range2)
return 0;
gun = getvar(V_GUN, (caddr_t)sp, EF_SECTOR);
gun = sp->sct_item[I_GUN];
if (gun == 0)
return 0;
shell = getvar(V_SHELL, (caddr_t)sp, EF_SECTOR);
shell = sp->sct_item[I_SHELL];
if (shell <= 0)
shell += supply_commod(sp->sct_own, sp->sct_x, sp->sct_y, I_SHELL,
1);
if (shell <= 0)
return 0;
putvar(V_SHELL, shell - 1, (caddr_t)sp, EF_SECTOR);
sp->sct_item[I_SHELL] = shell - 1;
putsect(sp);
damage = landgun((int)sp->sct_effic, gun);
if (sp->sct_own != def)