Limit nukes to strategic missions

[empserver] / src / lib / commands / arm.c

diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c
index 33481dcc659ad623f5243b0f03a15db26119c39e..144336cd729cf9c91bb25a50228b5f1610e9c9bf 100644 (file)
--- a/src/lib/commands/arm.c
+++ b/src/lib/commands/arm.c
@@ -62,7 +62,8 @@ arm(void)
            && getrel(getnatp(pl.pln_own), player->cnum) != ALLIED)
            continue;
        plc = &plchr[(int)pl.pln_type];
-       if ((plc->pl_flags & (P_O | P_M)) == (P_O | P_M)) {
+       if ((plc->pl_flags & (P_O | P_N | P_MAR))
+           || (plc->pl_flags & (P_M | P_F)) == (P_M | P_F)) {
            pr("A %s cannot carry nuclear devices!\n", plc->pl_name);
            return RET_FAIL;
        }
@@ -107,6 +108,7 @@ arm(void)
            pl.pln_flags |= PLN_AIRBURST;
        else
            pl.pln_flags &= ~PLN_AIRBURST;
+       pl.pln_mission = 0;
 
        snprintf(buf, sizeof(buf), "armed on your %s in %s",
                 prplane(&pl), xyas(pl.pln_x, pl.pln_y, pl.pln_own));