From 65410d16fd3ab12cb3846e93011ab6ebd2a1a5ec Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 20 Sep 2008 09:16:46 -0400 Subject: [PATCH] Disable incorrect autmatic supply in load and lload 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. --- src/lib/commands/load.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index cb35f1084..625c0237e 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -594,7 +594,14 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy, gift(sp->shp_own, player->cnum, &land, buf); land.lnd_ship = sp->shp_uid; 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); +#endif putland(land.lnd_uid, &land); if (!has_supply(&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); land.lnd_land = lp->lnd_uid; land.lnd_harden = 0; +#if 0 + /* FIXME same issue as in load_land_ship() */ resupply_all(&land); +#endif putland(land.lnd_uid, &land); if (!has_supply(&land)) pr("WARNING: %s is out of supply!\n", prland(&land)); -- 2.43.0