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

Clean up checks for zero value of pln_damage()

Browse source 
Before commit a269cdd7, pln_damage() returned zero when the damage was
nuclear, and callers used that to bypass conventional damage code.
Zero value can't happen anymore.
This commit is contained in:
Markus Armbruster 2010-04-02 19:08:27 +02:00
parent 3cceb59bb1
commit 162435e690
2 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/shpsub.c
View file

@ -507,12 +507,10 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
shp_hardtarget(&mvs->unit.ship), EF_SHIP,
N_SHP_MISS, N_SHP_SMISS, sublaunch, victim)) {
dam = pln_damage(&plp->plane, 'p', 1);
if (dam) {
mpr(victim,
"missile interdiction mission does %d damage to %s!\n",
dam, prship(&mvs->unit.ship));
shp_damage_one(mvs, dam);
}
mpr(victim,
"missile interdiction mission does %d damage to %s!\n",
dam, prship(&mvs->unit.ship));
shp_damage_one(mvs, dam);
} else {
dam = pln_damage(&plp->plane, 'p', 0);
collateral_damage(newx, newy, dam);