From 40d347ed85187611649417117f9b60ca9727e28f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 7 Jan 2015 14:16:01 +0100 Subject: [PATCH 1/1] retreat: Don't report a destroyed ship/land unit couldn't retreat Commit df8a1ff redone without breaking stuff. Signed-off-by: Markus Armbruster --- src/lib/subs/retreat.c | 6 ------ tests/retreat/journal.log | 4 ---- 2 files changed, 10 deletions(-) diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index e57a8d87f..5ecd294c9 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -124,9 +124,6 @@ retreat_ship1(struct shpstr *sp, char code, int orig) int changed; if (sp->shp_effic < SHIP_MINEFF) { - wu(0, sp->shp_own, - "%s %s,\nbut it died in the attack, and so couldn't retreat!\n", - prship(sp), conditions[findcondition(code)].desc[orig]); if (!orig) putship(sp->shp_uid, sp); return 0; @@ -322,9 +319,6 @@ retreat_land1(struct lndstr *lp, char code, int orig) struct lchrstr *lcp; if (lp->lnd_effic < LAND_MINEFF) { - wu(0, lp->lnd_own, - "%s %s,\nbut it died in the attack, and so couldn't retreat!\n", - prland(lp), conditions[findcondition(code)].desc[orig]); if (!orig) putland(lp->lnd_uid, lp); return 0; diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log index 401ff7bce..ea92e4e0f 100644 --- a/tests/retreat/journal.log +++ b/tests/retreat/journal.log @@ -1108,8 +1108,6 @@ Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#30) in 0,2 for 10 damage. Play#0 output Play#0 1 cs cargo ship (#30) takes 8 - Play#0 output Play#0 1 cs cargo ship (#30) was damaged, - Play#0 output Play#0 1 but it died in the attack, and so couldn't retreat! Play#0 output Play#0 1 cs cargo ship (#32) retreated with a damaged friend, Play#0 output Play#0 1 but had no crew, and couldn't retreat! Play#0 output Play#0 1 cs cargo ship (#35) retreated with a damaged friend, @@ -1262,8 +1260,6 @@ Play#0 output Play#0 1 1 planes spotted over 0,2 Play#0 output Play#0 1 1 pinpoint bombing raid did 44 damage to cav cavalry #30 Play#0 output Play#0 1 cav cavalry #30 takes 17 - Play#0 output Play#0 1 cav cavalry #30 was bombed, - Play#0 output Play#0 1 but it died in the attack, and so couldn't retreat! Play#0 output Play#0 1 cav cavalry #31 retreated with a bombed friend, and ended up at 2,2 Play#0 output Play#0 1 cav cavalry #32 retreated with a bombed friend, and ended up at 2,2 Play#0 output Play#0 1 cav cavalry #34 retreated with a bombed friend, and ended up at 2,2 -- 2.43.0