retreat: Don't report a destroyed ship/land unit couldn't retreat

Commit df8a1ff redone without breaking stuff.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index e57a8d87f85e91e74b160582be94b59e41932cb1..5ecd294c99251a3fc893fef30361d899858d3fed 100644 (file)
--- 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) {
     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;
        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) {
     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;
        if (!orig)
            putland(lp->lnd_uid, lp);
        return 0;

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index 401ff7bce339df2aff7cdcf9c4dda745d65736de..ea92e4e0f5f381be27530c24027bf059831ccdc2 100644 (file)
--- 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 > 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,
     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 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
     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