From 90a263d5ef68148389c7825d503e9a34a6863101 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 26 Nov 2011 22:48:28 +0100 Subject: [PATCH] drop and fly from carrier can fail to load last civ or mil pln_equip() refuses to abandon its base sector. Unfortunately, it checks even when flying off carriers, and refuses to load the last civilian or military depending on what happens to be in uninitialized variable sect. Broken in commit 91139692, v4.3.0. --- src/lib/subs/plnsub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index a167f636f..ee2fb655e 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -720,7 +720,10 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission) plp->plane.pln_y, I_SHELL, needed); #endif - abandon_needed = !!would_abandon(§, itype, needed, NULL); + if (pp->pln_ship >= 0 || pp->pln_land >= 0) + abandon_needed = 0; + else + abandon_needed = !!would_abandon(§, itype, needed, NULL); if (item[itype] < needed + abandon_needed) { pr("Not enough %s for %s\n", ichr[itype].i_name, prplane(pp)); return -1; -- 2.43.0