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

6
src/lib/commands/prod.c
View file

@ -264,8 +264,7 @@ prod(void)
if (*amount == 0)
totcomp++;
else {
used = min(used, (int)(getvar((int)*comp, (s_char *)&sect,
EF_SECTOR) / *amount));
used = min(used, sect.sct_item[(int)*comp] / *amount);
totcomp += *amount;
}
++comp;
@ -293,8 +292,7 @@ prod(void)
if (real < 0.0)
real = 0.0;
/* production backlog? */
if ((there =
getvar((int)vtype, (s_char *)&sect, EF_SECTOR)) >= 9999) {
if ((there = sect.sct_item[vtype]) >= 9999) {
there = 9999;
}
act = min(act, (9999 - there));