empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(opt_NEUTRON, buil, denotate, show_nuke_capab, show_nuke_build,

Browse source 
Options): Remove opt_NEUTRON option.  The option can be emulated
by manipulating the flags in a nuke characteristics file.
This commit is contained in:
Ron Koenderink 2005-11-13 12:30:37 +00:00
parent 555de3100c
commit 0a63d324ca
6 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/options.h
View file

@ -82,7 +82,6 @@
#define PINPOINTMISSILE /**/ #define PINPOINTMISSILE /**/
#define FALLOUT /* Enables secondary effects caused by radiation */ #define FALLOUT /* Enables secondary effects caused by radiation */
#define SAIL /* A update routine to move ships */ #define SAIL /* A update routine to move ships */
#define NEUTRON /* Enables Neurton Warheads */
#define NOMOBCOST /* No mob cost for firing from ships */ #define NOMOBCOST /* No mob cost for firing from ships */
/*#define SUPER_BARS *//* Bars can't be destroyed by fire */ /*#define SUPER_BARS *//* Bars can't be destroyed by fire */
#define EASY_BRIDGES /* Bridges can be built anywhere */ #define EASY_BRIDGES /* Bridges can be built anywhere */

1
include/optlist.h
View file

@ -68,7 +68,6 @@ extern int opt_LOANS;
extern int opt_LOSE_CONTACT; extern int opt_LOSE_CONTACT;
extern int opt_MARKET; extern int opt_MARKET;
extern int opt_MOB_ACCESS; extern int opt_MOB_ACCESS;
extern int opt_NEUTRON;
extern int opt_NOFOOD; extern int opt_NOFOOD;
extern int opt_NOMOBCOST; extern int opt_NOMOBCOST;
extern int opt_NO_FORT_FIRE; extern int opt_NO_FORT_FIRE;

2
src/lib/commands/buil.c
View file

@ -202,7 +202,7 @@ buil(void)
if (rqtech > tlev if (rqtech > tlev
|| (opt_DRNUKE && np->n_tech * drnuke_const > rlev)) || (opt_DRNUKE && np->n_tech * drnuke_const > rlev))
type = -1; type = -1;
if ((np->n_flags & N_NEUT) && !opt_NEUTRON) if (np->n_flags & N_NEUT)
type = -1; type = -1;
} }
if (type < 0) { if (type < 0) {

7
src/lib/global/options.c
View file

@ -231,12 +231,6 @@ int opt_SAIL = 1;
int opt_SAIL = 0; int opt_SAIL = 0;
#endif #endif
#ifdef NEUTRON
int opt_NEUTRON = 1;
#else
int opt_NEUTRON = 0;
#endif
#ifdef UPDATESCHED #ifdef UPDATESCHED
int opt_UPDATESCHED = 1; int opt_UPDATESCHED = 1;
#else #else
@ -288,7 +282,6 @@ struct option_list Options[] = {
{"LOSE_CONTACT", &opt_LOSE_CONTACT}, {"LOSE_CONTACT", &opt_LOSE_CONTACT},
{"MARKET", &opt_MARKET}, {"MARKET", &opt_MARKET},
{"MOB_ACCESS", &opt_MOB_ACCESS}, {"MOB_ACCESS", &opt_MOB_ACCESS},
{"NEUTRON", &opt_NEUTRON},
{"NO_FORT_FIRE", &opt_NO_FORT_FIRE}, {"NO_FORT_FIRE", &opt_NO_FORT_FIRE},
{"NO_HCMS", &opt_NO_HCMS}, {"NO_HCMS", &opt_NO_HCMS},
{"NO_LCMS", &opt_NO_LCMS}, {"NO_LCMS", &opt_NO_LCMS},

2
src/lib/subs/detonate.c
View file

@ -107,7 +107,7 @@ detonate(struct plnstr *pp, int x, int y)
if (sect.sct_x == x && sect.sct_y == y) if (sect.sct_x == x && sect.sct_y == y)
retval = damage; retval = damage;
if (opt_FALLOUT) { if (opt_FALLOUT) {
if (opt_NEUTRON && (ncp->n_flags & N_NEUT)) if (ncp->n_flags & N_NEUT)
fallout += damage * 30; fallout += damage * 30;
else else
fallout += damage * 3; fallout += damage * 3;

4
src/lib/subs/show.c
View file

@ -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); avail = NUK_BLD_WORK(np->n_lcm, np->n_hcm, np->n_oil, np->n_rad);
if (np->n_tech > tlev) if (np->n_tech > tlev)
continue; continue;
if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
continue;
if (opt_DRNUKE) if (opt_DRNUKE)
pr("%-13.13s %3d %3d %4d %4d %5d %4d %3d $%6d\n", pr("%-13.13s %3d %3d %4d %4d %5d %4d %3d $%6d\n",
np->n_name, np->n_lcm, np->n_hcm, np->n_oil, 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++) { for (np = nchr; np->n_name; np++) {
if (np->n_tech > tlev) if (np->n_tech > tlev)
continue; continue;
if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
continue;
if (opt_DRNUKE) if (opt_DRNUKE)
pr("%-13.13s %4d %3d %3d %4d %3d $%7d ", pr("%-13.13s %4d %3d %3d %4d %3d $%7d ",
np->n_name, np->n_blast, np->n_dam, np->n_name, np->n_blast, np->n_dam,