From 0a63d324ca0052eb8dc1b3c0b1b80de6a1c7040a Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Sun, 13 Nov 2005 12:30:37 +0000
Subject: [PATCH] (opt_NEUTRON, buil, denotate, show_nuke_capab,
 show_nuke_build, Options): Remove opt_NEUTRON option.  The option can be
 emulated by manipulating the flags in a nuke characteristics file.

---
 include/options.h        | 1 -
 include/optlist.h        | 1 -
 src/lib/commands/buil.c  | 2 +-
 src/lib/global/options.c | 7 -------
 src/lib/subs/detonate.c  | 2 +-
 src/lib/subs/show.c      | 4 ----
 6 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/include/options.h b/include/options.h
index 2e055396..ba632832 100644
--- a/include/options.h
+++ b/include/options.h
@@ -82,7 +82,6 @@
 #define	PINPOINTMISSILE /**/
 #define	FALLOUT			/* Enables secondary effects caused by radiation */
 #define	SAIL			/* A update routine to move ships */
-#define	NEUTRON			/* Enables Neurton Warheads */
 #define NOMOBCOST		/* No mob cost for firing from ships */
 /*#define SUPER_BARS *//* Bars can't be destroyed by fire */
 #define EASY_BRIDGES		/* Bridges can be built anywhere */
diff --git a/include/optlist.h b/include/optlist.h
index f9bcb12b..bad44ddc 100644
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -68,7 +68,6 @@ extern int opt_LOANS;
 extern int opt_LOSE_CONTACT;
 extern int opt_MARKET;
 extern int opt_MOB_ACCESS;
-extern int opt_NEUTRON;
 extern int opt_NOFOOD;
 extern int opt_NOMOBCOST;
 extern int opt_NO_FORT_FIRE;
diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 4bf2c8df..6ba59642 100644
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -202,7 +202,7 @@ buil(void)
 		if (rqtech > tlev
 		    || (opt_DRNUKE && np->n_tech * drnuke_const > rlev))
 		    type = -1;
-		if ((np->n_flags & N_NEUT) && !opt_NEUTRON)
+		if (np->n_flags & N_NEUT)
 		    type = -1;
 	    }
 	    if (type < 0) {
diff --git a/src/lib/global/options.c b/src/lib/global/options.c
index d08b900d..c479dcf2 100644
--- a/src/lib/global/options.c
+++ b/src/lib/global/options.c
@@ -231,12 +231,6 @@ int opt_SAIL = 1;
 int opt_SAIL = 0;
 #endif
 
-#ifdef NEUTRON
-int opt_NEUTRON = 1;
-#else
-int opt_NEUTRON = 0;
-#endif
-
 #ifdef UPDATESCHED
 int opt_UPDATESCHED = 1;
 #else
@@ -288,7 +282,6 @@ struct option_list Options[] = {
     {"LOSE_CONTACT", &opt_LOSE_CONTACT},
     {"MARKET", &opt_MARKET},
     {"MOB_ACCESS", &opt_MOB_ACCESS},
-    {"NEUTRON", &opt_NEUTRON},
     {"NO_FORT_FIRE", &opt_NO_FORT_FIRE},
     {"NO_HCMS", &opt_NO_HCMS},
     {"NO_LCMS", &opt_NO_LCMS},
diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c
index d6a7f278..920fe2ce 100644
--- a/src/lib/subs/detonate.c
+++ b/src/lib/subs/detonate.c
@@ -107,7 +107,7 @@ detonate(struct plnstr *pp, int x, int y)
 	if (sect.sct_x == x && sect.sct_y == y)
 	    retval = damage;
 	if (opt_FALLOUT) {
-	    if (opt_NEUTRON && (ncp->n_flags & N_NEUT))
+	    if (ncp->n_flags & N_NEUT)
 		fallout += damage * 30;
 	    else
 		fallout += damage * 3;
diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index e02ad633..6bd4a29e 100644
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -190,8 +190,6 @@ show_nuke_build(int tlev)
 	avail = NUK_BLD_WORK(np->n_lcm, np->n_hcm, np->n_oil, np->n_rad);
 	if (np->n_tech > tlev)
 	    continue;
-	if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
-	    continue;
 	if (opt_DRNUKE)
 	    pr("%-13.13s %3d %3d %4d %4d %5d %4d %3d $%6d\n",
 	       np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
@@ -219,8 +217,6 @@ show_nuke_capab(int tlev)
     for (np = nchr; np->n_name; np++) {
 	if (np->n_tech > tlev)
 	    continue;
-	if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
-	    continue;
 	if (opt_DRNUKE)
 	    pr("%-13.13s %4d %3d %3d %4d %3d $%7d ",
 	       np->n_name, np->n_blast, np->n_dam,