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

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

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 7586a2e27c1bf57e7bdd37083d3b15189608faca..9a3860fedd487e2af11c532eb507fcb141ff5e88 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -96,7 +96,7 @@ retreat_ship(struct shpstr *sp, char code)
     struct nstr_item ni;
     struct shpstr ship;
 
-    if (CANT_HAPPEN(!sp->shp_own))
+    if (sp->shp_effic < SHIP_MINEFF || CANT_HAPPEN(!sp->shp_own))
        return;
 
     retreat_ship1(sp, code, 1);
@@ -141,15 +141,6 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
     struct mchrstr *mcp;
     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 (opt_SAIL) {
        /* can't retreat a ship that's sailin, bad things happend */
        if (*sp->shp_path) {
@@ -352,7 +343,7 @@ retreat_land(struct lndstr *lp, char code)
     struct nstr_item ni;
     struct lndstr land;
 
-    if (CANT_HAPPEN(!lp->lnd_own))
+    if (lp->lnd_effic < LAND_MINEFF || CANT_HAPPEN(!lp->lnd_own))
        return;
 
     retreat_land1(lp, code, 1);
@@ -396,15 +387,6 @@ retreat_land1(struct lndstr *lp, char code, int orig)
     double mobcost;
     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;
-    }
-
     getsect(lp->lnd_x, lp->lnd_y, &sect);
 
     if (lp->lnd_mobil <= 0.0) {

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index 572282861136283331006edc348e72874e1570a2..2aa8edf11e5e9bced7ed40de58fd903e2f0ad7b2 100644 (file)
--- a/tests/retreat/journal.log
+++ b/tests/retreat/journal.log
@@ -1266,8 +1266,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 (#30) sunk!
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#31) in 0,2 for 8 damage.
     Play#0 output Play#0 1     cs   cargo ship (#31) takes 6
@@ -1411,8 +1409,6 @@
     Play#0 output Play#0 1 1 planes spotted over 1,1
     Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to inf  infantry #30
     Play#0 output Play#0 1     inf  infantry #30 takes 12
-    Play#0 output Play#0 1 inf  infantry #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 1,1 takes 4% collateral damage
     Play#0 output Play#0 1     tra  train #9 takes 1
     Play#0 output Play#0 1 1 planes spotted over -1,1