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

Nuclear-tipped missile exploding on launch could not damage base

Browse source 
Commit a269cdd7 (v4.3.23) removed the nuclear damage.  But it left the
nuke on the missile, which made pln_damage() oops and return zero
damage.

Fix by destroying the nuke separately.
(cherry picked from commit 876f3424b0)
This commit is contained in:
Markus Armbruster 2010-03-13 13:49:36 +01:00
parent b14edd0f7c
commit 7f3f9c6726
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,7 @@ msl_launch(struct plnstr *pp, int type, char *what, coord x, coord y,
natid victim, int *sublaunchp)
{
struct shpstr ship;
struct nukstr nuke;
struct sctstr sect;
int sublaunch = 0;
char *from;
@ -93,6 +94,11 @@ msl_launch(struct plnstr *pp, int type, char *what, coord x, coord y,
if (chance((0.05 + (100 - pp->pln_effic) / 100.0)
* (1 - techfact(pp->pln_tech, 1.0)))) {
mpr(pp->pln_own, "KABOOOOM! Missile explodes %s!\n", from);
if (getnuke(nuk_on_plane(pp), &nuke)) {
pr("%s lost!\n", prnuke(&nuke));
nuke.nuk_effic = 0;
putnuke(nuke.nuk_uid, &nuke);
}
if (chance(0.33)) {
dam = pln_damage(pp, 'p', 1) / 2;
if (pp->pln_ship >= 0) {

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

@ -988,7 +988,7 @@ pln_damage(struct plnstr *pp, char type, int noisy)
int effective = 1;
int pinbomber = 0;
if (CANT_HAPPEN(nuk_on_plane(pp) >= 0)) /* FIXME check uses! */
if (CANT_HAPPEN(nuk_on_plane(pp) >= 0))
return 0;
load = pln_load(pp);