diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c index d541f68b..8b8dd171 100644 --- 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 2cb1e206..6640d82c 100644 --- 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); } }