From 8209b88a54875f928153cad20f50052440bf56e9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 29 Apr 2008 21:10:33 +0200 Subject: [PATCH] Fix launch not to report the same ship sunk twice This happened when a marine missile with a conventional warhead sunk its target. --- src/lib/commands/laun.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c index 6ea506de..9f8215b7 100644 --- a/src/lib/commands/laun.c +++ b/src/lib/commands/laun.c @@ -311,13 +311,10 @@ launch_missile(struct plnstr *pp, int sublaunch) */ return RET_OK; } - dam = - pln_damage(pp, target_ship.shp_x, target_ship.shp_y, 'p', - &nukedam, 1); + dam = pln_damage(pp, target_ship.shp_x, target_ship.shp_y, 'p', + &nukedam, 1); if (!nukedam) { check_retreat_and_do_shipdamage(&target_ship, dam); - if (target_ship.shp_effic < SHIP_MINEFF) - pr("\t%s sunk!\n", prship(&target_ship)); putship(target_ship.shp_uid, &target_ship); } getship(target_ship.shp_uid, &target_ship);