(NUKEFAILDETONATE, opt_NUKEFAILDETONATE, Options, msl_hit): Remove

option NUKEFAILDETONATE.

diff --git a/include/options.h b/include/options.h
index ffcb36e0ea89dbe29ff3907c2f40c6a91e24152e..1a4a8a9385935dd4f311a980c4664c72c44381cb 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -99,8 +99,6 @@
 /*#define BIG_CITY *//* allow 10x civs in 'c' sectors */
 #define INTERDICT_ATT          /* interdict post-attack move in */
 #define        SHOWPLANE /**/
-#define        NUKEFAILDETONATE /**/
-#define        MISSINGMISSILES         /* Missiles have a change to miss the target */
 #define        UPDATESCHED             /* Used to controle update times and should always */
 #ifdef UPDATESCHED             /* be used */
 #define        DEMANDUPDATE            /* NOTE! Depends on UPDATESCHED! Don't use without it! */

diff --git a/include/optlist.h b/include/optlist.h
index 517e7fba417af020dfc39b515e7f20446c7907f3..428529c3a7c5abd00a4cf15fb259bc669a0a030c 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -72,7 +72,6 @@ extern int opt_NO_HCMS;
 extern int opt_NO_LCMS;
 extern int opt_NO_OIL;
 extern int opt_NO_PLAGUE;
-extern int opt_NUKEFAILDETONATE;
 extern int opt_PINPOINTMISSILE;
 extern int opt_RES_POP;
 extern int opt_ROLLOVER_AVAIL;

diff --git a/src/lib/global/options.c b/src/lib/global/options.c
index 490b33be69db93f6f57af9ad17ff7d01ac52060b..3b7b325d5ec63d997fa330978f70b1ffe3d38dd7 100644 (file)
--- a/src/lib/global/options.c
+++ b/src/lib/global/options.c
@@ -243,12 +243,6 @@ int opt_SAIL = 1;
 int opt_SAIL = 0;
 #endif
 
-#ifdef NUKEFAILDETONATE
-int opt_NUKEFAILDETONATE = 1;
-#else
-int opt_NUKEFAILDETONATE = 0;
-#endif
-
 #ifdef SHIPNAMES
 int opt_SHIPNAMES = 1;
 #else
@@ -321,7 +315,6 @@ struct option_list Options[] = {
     {"NOFOOD", &opt_NOFOOD},
     {"NOMOBCOST", &opt_NOMOBCOST},
     {"NONUKES", &opt_NONUKES},
-    {"NUKEFAILDETONATE", &opt_NUKEFAILDETONATE},
     {"PINPOINTMISSILE", &opt_PINPOINTMISSILE},
     {"RES_POP", &opt_RES_POP},
     {"SAIL", &opt_SAIL},

diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index f06a37824b5d664664a6dfac5e60b2d81ff9fc76..b6d30a13e2b023ee380950740ba4d9be3f53cc91 100644 (file)
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -103,23 +103,18 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
               * (1 - techfact(pp->pln_tech, 1.0)))) {
        mpr(pp->pln_own, "KABOOOOM!  Missile explodes %s!\n", from);
        if (chance(0.33)) {
-           if (pp->pln_nuketype != (s_char)-1 && opt_NUKEFAILDETONATE) {
-               pp->pln_flags &= ~PLN_AIRBURST;
-               detonate(pp, pp->pln_x, pp->pln_y);
-           } else {
-               dam = pln_damage(pp, pp->pln_x, pp->pln_y,
-                                'p', &dummyi, 1) / 2;
-               if (dam) {
-                   if (pp->pln_ship >= 0) {
-                       shipdamage(&ship, dam);
-                       putship(ship.shp_uid, &ship);
-                   } else {
-                       pr("Explosion damages %s %d%%",
-                          xyas(pp->pln_x, pp->pln_y, pp->pln_own), dam);
-                       getsect(pp->pln_x, pp->pln_y, &sect);
-                       sectdamage(&sect, dam, 0);
-                       putsect(&sect);
-                   }
+           dam = pln_damage(pp, pp->pln_x, pp->pln_y,
+                            'p', &dummyi, 1) / 2;
+           if (dam) {
+               if (pp->pln_ship >= 0) {
+                   shipdamage(&ship, dam);
+                   putship(ship.shp_uid, &ship);
+               } else {
+                   pr("Explosion damages %s %d%%",
+                      xyas(pp->pln_x, pp->pln_y, pp->pln_own), dam);
+                   getsect(pp->pln_x, pp->pln_y, &sect);
+                   sectdamage(&sect, dam, 0);
+                   putsect(&sect);
                }
            }
        }