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

(NUKEFAILDETONATE, opt_NUKEFAILDETONATE, Options, msl_hit): Remove

Browse source 
option NUKEFAILDETONATE.
This commit is contained in:
Markus Armbruster 2004-12-17 19:45:33 +00:00
parent 46608d6c83
commit 8f74995e99
4 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/options.h
View file

@ -99,8 +99,6 @@
/*#define BIG_CITY *//* allow 10x civs in 'c' sectors */ /*#define BIG_CITY *//* allow 10x civs in 'c' sectors */
#define INTERDICT_ATT /* interdict post-attack move in */ #define INTERDICT_ATT /* interdict post-attack move in */
#define SHOWPLANE /**/ #define SHOWPLANE /**/
#define NUKEFAILDETONATE /**/
#define MISSINGMISSILES /* Missiles have a change to miss the target */
#define UPDATESCHED /* Used to controle update times and should always */ #define UPDATESCHED /* Used to controle update times and should always */
#ifdef UPDATESCHED /* be used */ #ifdef UPDATESCHED /* be used */
#define DEMANDUPDATE /* NOTE! Depends on UPDATESCHED! Don't use without it! */ #define DEMANDUPDATE /* NOTE! Depends on UPDATESCHED! Don't use without it! */

1
include/optlist.h
View file

@ -72,7 +72,6 @@ extern int opt_NO_HCMS;
extern int opt_NO_LCMS; extern int opt_NO_LCMS;
extern int opt_NO_OIL; extern int opt_NO_OIL;
extern int opt_NO_PLAGUE; extern int opt_NO_PLAGUE;
extern int opt_NUKEFAILDETONATE;
extern int opt_PINPOINTMISSILE; extern int opt_PINPOINTMISSILE;
extern int opt_RES_POP; extern int opt_RES_POP;
extern int opt_ROLLOVER_AVAIL; extern int opt_ROLLOVER_AVAIL;

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

@ -243,12 +243,6 @@ int opt_SAIL = 1;
int opt_SAIL = 0; int opt_SAIL = 0;
#endif #endif
#ifdef NUKEFAILDETONATE
int opt_NUKEFAILDETONATE = 1;
#else
int opt_NUKEFAILDETONATE = 0;
#endif
#ifdef SHIPNAMES #ifdef SHIPNAMES
int opt_SHIPNAMES = 1; int opt_SHIPNAMES = 1;
#else #else
@ -321,7 +315,6 @@ struct option_list Options[] = {
{"NOFOOD", &opt_NOFOOD}, {"NOFOOD", &opt_NOFOOD},
{"NOMOBCOST", &opt_NOMOBCOST}, {"NOMOBCOST", &opt_NOMOBCOST},
{"NONUKES", &opt_NONUKES}, {"NONUKES", &opt_NONUKES},
{"NUKEFAILDETONATE", &opt_NUKEFAILDETONATE},
{"PINPOINTMISSILE", &opt_PINPOINTMISSILE}, {"PINPOINTMISSILE", &opt_PINPOINTMISSILE},
{"RES_POP", &opt_RES_POP}, {"RES_POP", &opt_RES_POP},
{"SAIL", &opt_SAIL}, {"SAIL", &opt_SAIL},

29
src/lib/subs/mslsub.c
View file

@ -103,23 +103,18 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
* (1 - techfact(pp->pln_tech, 1.0)))) { * (1 - techfact(pp->pln_tech, 1.0)))) {
mpr(pp->pln_own, "KABOOOOM! Missile explodes %s!\n", from); mpr(pp->pln_own, "KABOOOOM! Missile explodes %s!\n", from);
if (chance(0.33)) { if (chance(0.33)) {
if (pp->pln_nuketype != (s_char)-1 && opt_NUKEFAILDETONATE) { dam = pln_damage(pp, pp->pln_x, pp->pln_y,
pp->pln_flags &= ~PLN_AIRBURST; 'p', &dummyi, 1) / 2;
detonate(pp, pp->pln_x, pp->pln_y); if (dam) {
} else { if (pp->pln_ship >= 0) {
dam = pln_damage(pp, pp->pln_x, pp->pln_y, shipdamage(&ship, dam);
'p', &dummyi, 1) / 2; putship(ship.shp_uid, &ship);
if (dam) { } else {
if (pp->pln_ship >= 0) { pr("Explosion damages %s %d%%",
shipdamage(&ship, dam); xyas(pp->pln_x, pp->pln_y, pp->pln_own), dam);
putship(ship.shp_uid, &ship); getsect(pp->pln_x, pp->pln_y, &sect);
} else { sectdamage(&sect, dam, 0);
pr("Explosion damages %s %d%%", putsect(&sect);
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);
}
} }
} }
} }