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

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

@ -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},

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)))) {
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, &sect);
sectdamage(&sect, dam, 0);
putsect(&sect);
}
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, &sect);
sectdamage(&sect, dam, 0);
putsect(&sect);
}
}
}