]> git.pond.sub.org Git - empserver/commitdiff
bomb: Fix to report bombing of plane to owner once, not twice
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 11 Jan 2015 13:59:54 +0000 (14:59 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Mon, 2 Mar 2015 07:20:50 +0000 (08:20 +0100)
Has always been broken that way.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
src/lib/commands/bomb.c

index 20ab1891a76c749e04469d556789a41ff358f5fd..7b2a02831ac7cc245b33c6b7202224e866f6c6af 100644 (file)
@@ -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);
        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));
               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);
     }
        putplane(plane.pln_uid, &plane);
        collateral_damage(target->sct_x, target->sct_y, dam);
     }