empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable incorrect autmatic supply in load and lload

Browse source 
load_land_ship() and load_land_land() automatically resupply the land
units they load.  This can draw supplies from the sector where the
land units are.  When load() and lload() later update the sector, they
wipe out the update made for drawing supplies, and we get a seqno
mismatch oops.  Highly abusable.  Disable for now.
This commit is contained in:
Markus Armbruster 2008-09-20 09:16:46 -04:00
parent e0f7751f6b
commit 65410d16fd
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/commands/load.c
View file

@ -594,7 +594,14 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
gift(sp->shp_own, player->cnum, &land, buf); gift(sp->shp_own, player->cnum, &land, buf);
land.lnd_ship = sp->shp_uid; land.lnd_ship = sp->shp_uid;
land.lnd_harden = 0; land.lnd_harden = 0;
#if 0
/*
* FIXME if this supplies from the sector, the putsect in
* load() / lload() duplicates those supplies, causing a
* seqno mismatch
*/
resupply_all(&land); resupply_all(&land);
#endif
putland(land.lnd_uid, &land); putland(land.lnd_uid, &land);
if (!has_supply(&land)) if (!has_supply(&land))
pr("WARNING: %s is out of supply!\n", prland(&land)); pr("WARNING: %s is out of supply!\n", prland(&land));
@ -988,7 +995,10 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
gift(lp->lnd_own, player->cnum, &land, buf); gift(lp->lnd_own, player->cnum, &land, buf);
land.lnd_land = lp->lnd_uid; land.lnd_land = lp->lnd_uid;
land.lnd_harden = 0; land.lnd_harden = 0;
#if 0
/* FIXME same issue as in load_land_ship() */
resupply_all(&land); resupply_all(&land);
#endif
putland(land.lnd_uid, &land); putland(land.lnd_uid, &land);
if (!has_supply(&land)) if (!has_supply(&land))
pr("WARNING: %s is out of supply!\n", prland(&land)); pr("WARNING: %s is out of supply!\n", prland(&land));