From 93d842de20b3035e2b81bb11b7a570c5dc6aa46e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 1 May 2018 10:03:30 +0200 Subject: [PATCH] load: Drop dead recomputation of load_spy load_land_ship() recomputes load_spy "since [the carrier] may have changed". Has been that way since the feature was added in 4.2.0, but it's nonsense. Drop it. Signed-off-by: Markus Armbruster --- src/lib/commands/load.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index 912582e5..d6d5ab94 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -589,21 +589,18 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy, } /* Fit unit on ship */ if (loading) { - /* We have to check again, since it may have changed */ - if ((mchr[(int)sp->shp_type].m_flags & M_SUB) && - (mchr[(int)sp->shp_type].m_nland == 0)) { + if (load_spy) { if (shp_nland(sp) >= 2) { pr("Non-land unit carrying subs can only carry up to two spy units.\n"); return 0; } - /* Eh, let 'em load a spy only */ - load_spy = 1; - } - if (!load_spy && shp_nland(sp) >= mchr[sp->shp_type].m_nland) { - if (noisy) - pr("%s doesn't have room for any more land units!\n", - prship(sp)); - return 0; + } else { + if (shp_nland(sp) >= mchr[sp->shp_type].m_nland) { + if (noisy) + pr("%s doesn't have room for any more land units!\n", + prship(sp)); + return 0; + } } sprintf(buf, "loaded on your %s at %s", prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));