From 0e8bcce59c2a7d91743ca64bef51edd6d4d44844 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 3 Oct 2009 16:32:03 -0400 Subject: [PATCH] Remove redundant load checks before pln_damage() pln_damage() copes with any load just fine. --- src/lib/commands/bomb.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c index c5021232c..850f0f137 100644 --- a/src/lib/commands/bomb.c +++ b/src/lib/commands/bomb.c @@ -344,9 +344,8 @@ eff_bomb(struct emp_qelem *list, struct sctstr *target) plp = (struct plist *)qp; if (changed_plane_aborts(plp)) continue; - if (plp->load || nuk_on_plane(&plp->plane) >= 0) - dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, - 'p', &nukedam, 1); + dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, + 'p', &nukedam, 1); } if (dam <= 0) /* dam == 0 if only nukes were delivered */ return; @@ -422,9 +421,8 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target) plp = (struct plist *)qp; if (changed_plane_aborts(plp)) continue; - if (plp->load || nuk_on_plane(&plp->plane) >= 0) - dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, - 'p', &nukedam, 1); + dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, + 'p', &nukedam, 1); } if (dam <= 0) /* dam == 0 if only nukes were delivered */ 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) { plp = (struct plist *)qp; - if (plp->load || nuk_on_plane(&plp->plane) >= 0) - dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, - 's', &nukedam, 1); + dam += pln_damage(&plp->plane, target->sct_x, target->sct_y, + 's', &nukedam, 1); } if (dam <= 0) /* dam == 0 if only nukes were delivered */ return; -- 2.43.0