Revert "retreat: Oops on retreating ghosts"

This reverts commit c3a839934f159b72b510cecb45c8c396efb38119.

The commit message's claim that the code never actually retreats
ghosts is wrong: boar() does.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Conflicts:
	src/lib/subs/retreat.c

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 961552f042bf0663c57da3d733dd070a5276e211..15acd72f9fb149501fc598bde6feadd2b3021ed4 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -76,8 +76,6 @@ retreat_ship(struct shpstr *sp, char code)
     struct nstr_item ni;
     struct shpstr ship;
 
-    if (CANT_HAPPEN(!sp->shp_own))
-       return;
     if (sp->shp_own == player->cnum || !sp->shp_rpath[0])
        return;
 
@@ -184,8 +182,6 @@ retreat_land(struct lndstr *lp, char code)
     struct nstr_item ni;
     struct lndstr land;
 
-    if (CANT_HAPPEN(!lp->lnd_own))
-       return;
     if (lp->lnd_own == player->cnum || !lp->lnd_rpath[0])
        return;
 

diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1
index d52c9e0b7a7e80eadcf9a5229b7c5c56ee86b474..5b9fcb683924c40390ee738bf71eb3d5949e06a1 100644 (file)
--- a/tests/retreat/01-retreat-1
+++ b/tests/retreat/01-retreat-1
@@ -146,7 +146,6 @@ board 130 5
 board 132 5
 50
 | BUG: group does not retreat
-| BUG: oopses!
 __cmd added 1 4 0
 ||| Land units
 | BUG: condition b triggers only on hit

diff --git a/tests/retreat/server.log b/tests/retreat/server.log
index 8509c993c16bb7e067282092608342c5cf71ca25..1a978003d61e381b1669d0a8b1239edb047ff24d 100644 (file)
--- a/tests/retreat/server.log
+++ b/tests/retreat/server.log
@@ -8,8 +8,6 @@ Connect from 127.0.0.1
 Connect from 127.0.0.1
 tester@127.0.0.1 using country #1
 tester@127.0.0.1 logged in as country #1
-Oops: !sp->shp_own in ../src/lib/subs/retreat.c:79
-Crash dump complete
 tester@127.0.0.1 logged out, country #1
 Connect from 127.0.0.1
 tester@127.0.0.1 using country #0