diff --git a/include/options.h b/include/options.h index ffcb36e0..1a4a8a93 100644 --- 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 517e7fba..428529c3 100644 --- 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 490b33be..3b7b325d 100644 --- 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 f06a3782..b6d30a13 100644 --- 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, §); - sectdamage(§, dam, 0); - putsect(§); - } + 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, §); + sectdamage(§, dam, 0); + putsect(§); } } }