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

Remove redundant load checks before pln_damage()

Browse source 
pln_damage() copes with any load just fine.
This commit is contained in:
Markus Armbruster 2009-10-03 16:32:03 -04:00
parent 54b1c04686
commit 0e8bcce59c
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/commands/bomb.c
View file

@ -344,9 +344,8 @@ eff_bomb(struct emp_qelem *list, struct sctstr *target)
plp = (struct plist *)qp; plp = (struct plist *)qp;
if (changed_plane_aborts(plp)) if (changed_plane_aborts(plp))
continue; continue;
if (plp->load || nuk_on_plane(&plp->plane) >= 0) dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, 'p', &nukedam, 1);
'p', &nukedam, 1);
} }
if (dam <= 0) /* dam == 0 if only nukes were delivered */ if (dam <= 0) /* dam == 0 if only nukes were delivered */
return; return;
@ -422,9 +421,8 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target)
plp = (struct plist *)qp; plp = (struct plist *)qp;
if (changed_plane_aborts(plp)) if (changed_plane_aborts(plp))
continue; continue;
if (plp->load || nuk_on_plane(&plp->plane) >= 0) dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, 'p', &nukedam, 1);
'p', &nukedam, 1);
} }
if (dam <= 0) /* dam == 0 if only nukes were delivered */ if (dam <= 0) /* dam == 0 if only nukes were delivered */
return; return;
@ -796,9 +794,8 @@ strat_bomb(struct emp_qelem *list, struct sctstr *target)
for (qp = list->q_forw; qp != list; qp = qp->q_forw) { for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
plp = (struct plist *)qp; plp = (struct plist *)qp;
if (plp->load || nuk_on_plane(&plp->plane) >= 0) dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, 's', &nukedam, 1);
's', &nukedam, 1);
} }
if (dam <= 0) /* dam == 0 if only nukes were delivered */ if (dam <= 0) /* dam == 0 if only nukes were delivered */
return; return;