(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.

diff --git a/include/options.h b/include/options.h
index 2e055396276ba6fe5681aada4eb7423e5eaeb25d..ba632832432a558fc637b2cec7a6eab3e30ea3f9 100644 (file)
--- 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 f9bcb12bda590643c881f8abd543176176538ae3..bad44ddc67078be138d0522c0c6a17925c42c19f 100644 (file)
--- 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 4bf2c8dfbf26e0b599ca02b30e635549b287696b..6ba596429fb22da382fa9edc47065846fa77ee2f 100644 (file)
--- 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 d08b900d56f963df7b119114a64e474bc2f78276..c479dcf23ddc69e15d06e76b1fa9b800274c0835 100644 (file)
--- 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 d6a7f27893e28d79aafd8bf49e2e9938c22dc1a6..920fe2ce3636cfd6e1330cb4278bae85ffbfbb2d 100644 (file)
--- 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 e02ad633265aa6533936c255af6a9b8ea4d2f801..6bd4a29e3d454f6a4a31a26a8a96af0cfcf65aa1 100644 (file)
--- 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,