From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 11 Jan 2015 13:59:54 +0000 (+0100)
Subject: bomb: Fix to report bombing of plane to owner once, not twice
X-Git-Tag: v4.3.33~68
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=df6b13ce896d47b22f003d3696e3bfca677d1b78

bomb: Fix to report bombing of plane to owner once, not twice

Has always been broken that way.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index 20ab1891a..7b2a02831 100644
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -572,19 +572,10 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
 	else
 	    plane.pln_effic -= dam;
 	plane.pln_mobil = (dam * plane.pln_mobil / 100.0);
-	if (own == player->cnum) {
-	    pr("%s reports %d%% damage\n", prplane(&plane), dam);
-	} else {
-	    if (own != 0)
-		wu(0, own,
-		   "%s pinpoint bombing raid did %d%% damage to %s\n",
-		   cname(player->cnum), dam, prplane(&plane));
-	}
-	nreport(player->cnum, N_DOWN_PLANE, own, 1);
-	if (own != 0)
-	    wu(0, own, "%s bombs did %d%% damage to %s at %s\n",
+	mpr(own, "%s bombs did %d%% damage to %s at %s\n",
 	       cname(player->cnum), dam, prplane(&plane),
 	       xyas(target->sct_x, target->sct_y, own));
+	nreport(player->cnum, N_DOWN_PLANE, own, 1);
 	putplane(plane.pln_uid, &plane);
 	collateral_damage(target->sct_x, target->sct_y, dam);
     }