Streamline flak damage report to plane owner

Don't tell him that it's his plane, he knows that.

Put a " -- " between "takes N%" and "aborted" / "shot down" for
ordinary flak as well, not just for flak vs. pinpoint bombing.

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index d541f68b8efed7c4205f34fbf445700a44926340..8b8dd17190b2537b8e2d79d5eeaacdac5e585e05 100644 (file)
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -812,8 +812,8 @@ pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
     if (dam <= 0)
        return 0;
     disp = ac_damage_plane(pp, from, dam, 1, dmess);
-    PR(pp->pln_own, "    Flak! %s %s takes %d%s%s.\n",
-       cname(pp->pln_own), prplane(pp), dam, *dmess ? " --" : "", dmess);
+    PR(pp->pln_own, "    Flak! %s takes %d%s%s.\n",
+       prplane(pp), dam, *dmess ? " --" : "", dmess);
 
     putplane(pp->pln_uid, pp);
     return disp > 0;

diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index 2cb1e2067c0282d1f91a7ae8931e58564aa13a17..6640d82cedf242d0c7be586c2056dd58fb469968 100644 (file)
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -707,8 +707,8 @@ ac_fireflak(struct emp_qelem *list, natid from, int guns)
        plp = (struct plist *)qp;
        n = ac_flak_dam(guns, pln_def(&plp->plane), plp->pcp->pl_flags);
        ac_planedamage(plp, from, n, 1, msg);
-       PR(plp->plane.pln_own, "    %s %s takes %d%s.\n",
-          cname(plp->plane.pln_own), prplane(&plp->plane), n, msg);
+       PR(plp->plane.pln_own, "    %s takes %d%s%s.\n",
+          prplane(&plp->plane), n, *msg ? " --" : "", msg);
     }
 }