From 7b3d541c0d6ec407f911e404df04b227dcf1861e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Jan 2015 20:13:44 +0100 Subject: [PATCH] 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 Conflicts: src/lib/subs/retreat.c --- src/lib/subs/retreat.c | 4 ---- tests/retreat/01-retreat-1 | 1 - tests/retreat/server.log | 2 -- 3 files changed, 7 deletions(-) diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 961552f0..15acd72f 100644 --- 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 d52c9e0b..5b9fcb68 100644 --- 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 8509c993..1a978003 100644 --- 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