Nuclear-tipped missile exploding on launch could not damage base

[empserver] / src / lib / subs / plnsub.c

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index fd178aa99c2ae297d81f14aef2e6b0106d0f6f30..5e11ec05e2f3f8c907297a100eac7036e835cc54 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -651,8 +651,6 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
     switch (mission) {
     case 's':          /* strategic bomb */
     case 'p':          /* pinpoint bomb */
-       if (nuk_on_plane(pp) >= 0)
-           break;
        itype = I_SHELL;
        break;
     case 't':          /* transport */
@@ -683,6 +681,8 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
        break;
     case 'r':          /* reconnaissance */
     case 'e':          /* escort */
+       load = 0;
+       break;
     case 'i':          /* missile interception */
        if (CANT_HAPPEN(!(pcp->pl_flags & P_M)
                        || !(pcp->pl_flags & (P_N | P_O))))
@@ -701,6 +701,16 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
            pr("%s can't contribute to mission\n", prplane(pp));
            return -1;
        }
+       if (nuk_on_plane(pp) >= 0) {
+           if (mission == 's' || mission == 't')
+               needed = 0;
+           else {
+               pr("%s can't fly this mission"
+                  " while it is carrying a nuclear weapon",
+                  prplane(pp));
+               return -1;
+           }
+       }
        if (itype == I_CIVIL && pp->pln_own != own) {
            pr("You don't control those civilians!\n");
            return -1;
@@ -967,13 +977,9 @@ pln_hitchance(struct plnstr *pp, int hardtarget, int type)
     return hitchance;
 }
 
-/* return 0 if there was a nuclear detonation */
-
 int
-pln_damage(struct plnstr *pp, coord x, coord y, char type, int *nukedamp,
-          int noisy)
+pln_damage(struct plnstr *pp, char type, int noisy)
 {
-    struct nukstr nuke;
     struct plchrstr *pcp = plchr + pp->pln_type;
     int load, i;
     int hitroll;
@@ -982,14 +988,8 @@ pln_damage(struct plnstr *pp, coord x, coord y, char type, int *nukedamp,
     int effective = 1;
     int pinbomber = 0;
 
-    if (getnuke(nuk_on_plane(pp), &nuke)) {
-       mpr(pp->pln_own, "Releasing RV's for %s detonation...\n",
-           pp->pln_flags & PLN_AIRBURST ? "airburst" : "groundburst");
-       *nukedamp = detonate(&nuke, x, y,
-                            pp->pln_flags & PLN_AIRBURST);
+    if (CANT_HAPPEN(nuk_on_plane(pp) >= 0))
        return 0;
-    }
-    *nukedamp = 0;
 
     load = pln_load(pp);
     if (!load)                /* e.g. ab, blowing up on launch pad */