Simplify pln_equip() and mission_pln_equip()

Mission 'n' was removed along with nuke_bomb() many years ago.
Simplify accordingly.

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 580cdea98cdf616ad95fa6648024a809a89e3818..e76dedb15f5cca30ff772e9ba929cc85bb5000c5 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -987,7 +987,6 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
     struct shpstr ship;
     struct sctstr sect;
     i_type itype;
-    int rval;
     short *item;
 
     pp = &plp->plane;
@@ -1006,7 +1005,6 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
        return -1;
     }
     item[I_PETROL] -= pcp->pl_fuel;
-    rval = 0;
     if (!(flags & P_F)) {
        load = pln_load(pp);
        itype = I_NONE;
@@ -1037,10 +1035,6 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
            itype = I_MILIT;
            needed = load / ip->i_lbs;
            break;
-       case 'n':
-           if (pp->pln_nuketype == -1)
-               rval = -1;
-           break;
        case 'i':               /* missile interception */
            if (load) {
                itype = I_SHELL;
@@ -1050,9 +1044,8 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
        default:
            break;
        }
-       if (rval < 0 || (itype != I_NONE && needed <= 0)) {
+       if (itype != I_NONE && needed <= 0)
            return -1;
-       }
        if (itype != I_NONE) {
            if (itype == I_SHELL && item[itype] < needed)
                item[itype] += supply_commod(plp->plane.pln_own,
@@ -1074,7 +1067,7 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
        putland(land.lnd_uid, &land);
     else
        putsect(&sect);
-    return rval;
+    return 0;
 }
 
 /*

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index 1c5c8ad5f10e9555f1f90b6a15d5a1f40d371be1..dc6a116d7fbcc5712c64fc30ba51399b91026c89 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -606,7 +606,6 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, char mission)
     struct shpstr ship;
     struct sctstr sect;
     i_type itype;
-    int rval;
     short *item;
     int own;
     int abandon_needed;
@@ -639,7 +638,6 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, char mission)
        return -1;
     }
     item[I_PETROL] -= pcp->pl_fuel;
-    rval = 0;
     if ((flags & P_F) == 0) {
        load = pln_load(pp);
        itype = I_NONE;
@@ -671,14 +669,10 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, char mission)
            itype = I_MILIT;
            needed = load / ip->i_lbs;
            break;
-       case 'n':
-           if (pp->pln_nuketype == -1)
-               rval = -1;
-           break;
        default:
            break;
        }
-       if (rval < 0 || (itype != I_NONE && needed <= 0)) {
+       if (itype != I_NONE && needed <= 0) {
            pr("%s can't contribute to mission\n", prplane(pp));
            return -1;
        }
@@ -725,7 +719,7 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, char mission)
        }
        putsect(&sect);
     }
-    return rval;
+    return 0;
 }
 
 void