mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-04-28 05:33:21 +00:00
Code Issues Releases Wiki Activity

Magic boats no longer ignore the warp rules

Browse Source
This commit is contained in:
Zeno Rogue 2017-08-18 02:23:53 +02:00
parent b39439a3ae
commit 1ce21a1d94
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game.cpp
View File

@ -6475,7 +6475,7 @@ bool movepcto(int d, int subdir, bool checkonly) {
goto boatjump; goto boatjump;
} }
if(!c2->monst && cwt.c->wall == waBoat && boatGoesThrough(c2) && markOrb(itOrbWater)) { if(!c2->monst && cwt.c->wall == waBoat && boatGoesThrough(c2) && markOrb(itOrbWater) && !nonAdjacentPlayer(c2, cwt.c)) {
if(havePushConflict(cwt.c, checkonly)) return false; if(havePushConflict(cwt.c, checkonly)) return false;
if(monstersnear(c2,NULL,moPlayer,NULL,cwt.c)) { if(monstersnear(c2,NULL,moPlayer,NULL,cwt.c)) {