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

20
src/lib/update/ship.c
View file

@ -117,7 +117,7 @@ upd_ship(register struct shpstr *sp, register int etus,
struct sctstr *sectp;
struct mchrstr *mp;
int vec[I_MAX + 1];
int cvec[I_MAX + 1];
u_short pstage, ptime;
int oil_gained;
int max_oil;
int max_food;
@ -204,9 +204,10 @@ upd_ship(register struct shpstr *sp, register int etus,
* do plague stuff. plague can't break out on ships,
* but it can still kill people.
*/
getvec(VT_COND, cvec, (s_char *)sp, EF_SHIP);
if (cvec[C_PSTAGE] > 0) {
n = plague_people(np, vec, cvec, etus);
pstage = sp->shp_pstage;
ptime = sp->shp_ptime;
if (pstage != PLG_HEALTHY) {
n = plague_people(np, vec, &pstage, &ptime, etus);
switch (n) {
case PLG_DYING:
wu(0, sp->shp_own,
@ -218,9 +219,9 @@ upd_ship(register struct shpstr *sp, register int etus,
break;
case PLG_INCUBATE:
/* Are we still incubating? */
if (n == cvec[C_PSTAGE]) {
if (n == pstage) {
/* Yes. Will it turn "infectious" next time? */
if (cvec[C_PTIME] <= etus) {
if (ptime <= etus) {
/* Yes. Report an outbreak. */
wu(0, sp->shp_own,
"Outbreak of PLAGUE on %s!\n", prship(sp));
@ -234,9 +235,9 @@ upd_ship(register struct shpstr *sp, register int etus,
break;
case PLG_EXPOSED:
/* Has the plague moved to "incubation" yet? */
if (n != cvec[C_PSTAGE]) {
if (n != pstage) {
/* Yes. Will it turn "infectious" next time? */
if (cvec[C_PTIME] <= etus) {
if (ptime <= etus) {
/* Yes. Report an outbreak. */
wu(0, sp->shp_own,
"Outbreak of PLAGUE on %s!\n", prship(sp));
@ -248,7 +249,8 @@ upd_ship(register struct shpstr *sp, register int etus,
break;
}
putvec(VT_COND, cvec, (s_char *)sp, EF_SHIP);
sp->shp_pstage = pstage;
sp->shp_ptime = ptime;
}
putvec(VT_ITEM, vec, (s_char *)sp, EF_SHIP);
pops[sp->shp_own] += vec[I_CIVIL];