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.

diff --git a/src/lib/subs/landgun.c b/src/lib/subs/landgun.c
index ec833ff310f4e8c539c583945fdb85f96f8b5002..4d9e6cec8eb440759f471991de99c383663de9cf 100644 (file)
--- 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]);