From 92a502df0b9b892dffe60b492bb9e669a2b1b200 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 8 May 2013 20:37:36 +0200 Subject: [PATCH] Consistently require guns for dropping depth charges The fire command requires at least one gun for depth charging, but missions and return fire don't. Has always been that way, except between 4.0.6 and commit a3ad623 (v4.3.12), when depth charging worked exactly like gun fire, and guns were consistently required. Require guns for all ways to drop depth charges. --- src/lib/subs/landgun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/subs/landgun.c b/src/lib/subs/landgun.c index ec833ff31..4d9e6cec8 100644 --- a/src/lib/subs/landgun.c +++ b/src/lib/subs/landgun.c @@ -133,7 +133,7 @@ shp_dchrg(struct shpstr *sp) if (sp->shp_effic < 60 || (mchr[sp->shp_type].m_flags & M_DCH) == 0) return -1; - if (sp->shp_item[I_MILIT] == 0) + if (sp->shp_item[I_MILIT] == 0 || sp->shp_item[I_GUN] == 0) return -1; shp_supply(sp, I_SHELL, 2); dchrgs = MIN(2, sp->shp_item[I_SHELL]); -- 2.43.0