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

16
src/lib/subs/trdsub.c
View file

@ -139,10 +139,9 @@ trade_desc(struct trdstr *tp, union trdgenstr *tgp)
pr("(%3d) tech %d %d%% %s [",
tp->trd_owner, sp->shp_tech, sp->shp_effic, prship(sp));
for (i = 0; i < sp->shp_nv; i++) {
if (isitem(sp->shp_vtype[i]))
pr("%c:%d ",
ichr[unitem(sp->shp_vtype[i])].i_mnem, sp->shp_vamt[i]);
for (i = 1; i <= I_MAX; ++i) {
if (sp->shp_item[i])
pr("%c:%d ", ichr[i].i_mnem, sp->shp_item[i]);
}
pr("] #%d", tp->trd_unitid);
if (opt_SHOWPLANE) {
@ -198,10 +197,9 @@ trade_desc(struct trdstr *tp, union trdgenstr *tgp)
pr("(%3d) tech %d %d%% %s [",
tp->trd_owner,
lp->lnd_tech, lp->lnd_effic, lchr[(int)lp->lnd_type].l_name);
for (i = 0; i < lp->lnd_nv; i++) {
if (isitem(lp->lnd_vtype[i]))
pr("%c:%d ",
ichr[unitem(lp->lnd_vtype[i])].i_mnem, lp->lnd_vamt[i]);
for (i = 1; i <= I_MAX; ++i) {
if (lp->lnd_item[i])
pr("%c:%d ", ichr[i].i_mnem, lp->lnd_item[i]);
}
pr("] #%d", tp->trd_unitid);
if (opt_SHOWPLANE) {
@ -262,7 +260,7 @@ get_couval(int cnum)
for (k = 0; ichr[k].i_name; k++) {
if (ichr[k].i_value == 0 || ichr[k].i_vtype == 0)
continue;
val = getvar(ichr[k].i_vtype, (s_char *)sp, EF_SECTOR);
val = sp->sct_item[ichr[k].i_vtype];
secttot += val * ichr[k].i_value;
}
}