(disarm): Give disarmed nuke to sector owner. This was forgotten in

rev. 1.15.
(gift): Extend to nukes.

diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c
index 956ddcbb503d3003d7bbfc6e9682b27be6aba47b..1cf2da09b4a8a6dd17e231c867c44f6e3e0f076d 100644 (file)
--- a/src/lib/commands/arm.c
+++ b/src/lib/commands/arm.c
@@ -128,6 +128,8 @@ disarm(void)
     struct plnstr pl;
     struct nukstr nuke;
     struct nstr_item ni;
+    struct sctstr sect;
+    char buf[128];
 
     if (!snxtitem(&ni, EF_PLANE, player->argp[1]))
        return RET_SYN;
@@ -147,6 +149,11 @@ disarm(void)
            CANT_REACH();
            continue;
        }
+       getsect(nuke.nuk_x, nuke.nuk_y, &sect);
+       snprintf(buf, sizeof(buf), "unloaded in your %s at %s",
+                dchr[sect.sct_type].d_name,
+                xyas(sect.sct_x, sect.sct_y, sect.sct_own));
+       gift(sect.sct_own, player->cnum, &nuke, EF_NUKE, buf);
        nuke.nuk_plane = -1;
        pl.pln_nuketype = -1;
        pl.pln_flags &= ~PLN_AIRBURST;

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index c9a417ae84896dd4583b0f19de66ee2a700627d9..54a3380953f6c71063be949f2224fc2b49491ac9 100644 (file)
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -335,6 +335,9 @@ gift(natid givee, natid giver, void *ptr, int type, char *mesg)
        case EF_LAND:
            p = prland(ptr);
            break;
+       case EF_NUKE:
+           p = prnuke(ptr);
+           break;
        default:
            CANT_REACH();
            p = "a red herring";