mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-02-02 20:29:17 +00:00
Magic boats no longer ignore the warp rules
This commit is contained in:
parent
b39439a3ae
commit
1ce21a1d94
2
game.cpp
2
game.cpp
@ -6475,7 +6475,7 @@ bool movepcto(int d, int subdir, bool checkonly) {
|
||||
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(monstersnear(c2,NULL,moPlayer,NULL,cwt.c)) {
|
||||
|
Loading…
Reference in New Issue
Block a user