empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "retreat: Oops on retreating ghosts"

Browse source 
This reverts commit c3a839934f.

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
This commit is contained in:
Markus Armbruster 2015-01-12 20:13:44 +01:00
parent ebe4f05d87
commit 7b3d541c0d
3 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/subs/retreat.c
View file

@ -76,8 +76,6 @@ retreat_ship(struct shpstr *sp, char code)
struct nstr_item ni; struct nstr_item ni;
struct shpstr ship; struct shpstr ship;
if (CANT_HAPPEN(!sp->shp_own))
return;
if (sp->shp_own == player->cnum || !sp->shp_rpath[0]) if (sp->shp_own == player->cnum || !sp->shp_rpath[0])
return; return;
@ -184,8 +182,6 @@ retreat_land(struct lndstr *lp, char code)
struct nstr_item ni; struct nstr_item ni;
struct lndstr land; struct lndstr land;
if (CANT_HAPPEN(!lp->lnd_own))
return;
if (lp->lnd_own == player->cnum || !lp->lnd_rpath[0]) if (lp->lnd_own == player->cnum || !lp->lnd_rpath[0])
return; return;

1
tests/retreat/01-retreat-1
View file

@ -146,7 +146,6 @@ board 130 5
board 132 5 board 132 5
50 50
| BUG: group does not retreat | BUG: group does not retreat
| BUG: oopses!
__cmd added 1 4 0 __cmd added 1 4 0
||| Land units ||| Land units
| BUG: condition b triggers only on hit | BUG: condition b triggers only on hit

2
tests/retreat/server.log
View file

@ -8,8 +8,6 @@ Connect from 127.0.0.1
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 using country #1
tester@127.0.0.1 logged in as 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 tester@127.0.0.1 logged out, country #1
Connect from 127.0.0.1 Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0