From 3a1f240dc4d0f0c65cc76cdf72c98601c15681d4 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 24 Jul 2016 15:08:14 +0200 Subject: [PATCH] attack assault board: Fix message when attacking land unit dies Loss of an attacking land is reported like this: @linf light infantry #1 dies assault 21,-3! Bad grammar and newline missing between the "@" casualty character and the message. Messed up in Empire 2. Affects only attackers, because the code special-cases defense to avoid the bad grammar there (close, but no cigar), and defenders don't get casualty characters printed. Fix it to @ linf light infantry #1 dies assaulting 21,-3! Signed-off-by: Markus Armbruster --- src/lib/subs/lndsub.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c index 65ecbe2d..29131466 100644 --- a/src/lib/subs/lndsub.c +++ b/src/lib/subs/lndsub.c @@ -183,8 +183,10 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas) lnd_submil(&llp->unit.land, cas); if (llp->unit.land.lnd_effic < LAND_MINEFF) { - sprintf(buf, "dies %s %s!", - combat_mode ? att_mode[combat_mode] : "defending", + if (llp->unit.land.lnd_own == player->cnum) + pr("\n"); + sprintf(buf, "dies %sing %s!", + att_mode[combat_mode], xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, llp->unit.land.lnd_own)); lnd_print(llp->unit.land.lnd_own, llp, buf);