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

@ -145,13 +145,13 @@ sell(void)
if (land.lnd_own == player->cnum)
tot_mil += total_mil(&land);
}
if (((tot_mil + (getvar(V_MILIT, (char *)&sect, EF_SECTOR))) * 10)
< getvar(V_CIVIL, (char *)&sect, EF_SECTOR)) {
if (((tot_mil + sect.sct_item[I_MILIT]) * 10)
< sect.sct_item[I_CIVIL]) {
pr("Military control required to sell goods.\n");
return RET_FAIL;
}
}
if (((amt = getvar(ip->i_vtype, (char *)&sect, EF_SECTOR))) == 0) {
if ((amt = sect.sct_item[ip->i_vtype]) == 0) {
pr("You don't have any %s to sell there.\n", ip->i_name);
return RET_FAIL;
}
@ -167,7 +167,7 @@ sell(void)
amt -= com;
pr("Sold %d %s at %s (%d left)\n", com, ip->i_name,
xyas(sect.sct_x, sect.sct_y, player->cnum), amt);
putvar(ip->i_vtype, amt, (char *)&sect, EF_SECTOR);
sect.sct_item[ip->i_vtype] = amt;
cc = ip->i_mnem;
putsect(&sect);
if (totalcom > 0) {