mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed some bugs with the activation of Orb of Yendor

This commit is contained in:
Zeno Rogue 2017-09-17 14:00:28 +02:00
parent edc70be39e
commit 5747e8eacd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
game.cpp
View File

@ -6448,6 +6448,10 @@ bool movepcto(int d, int subdir, bool checkonly) {
return false;
}
if(c2->item == itOrbYendor && !checkonly && !peace::on && !itemHiddenFromSight(c2) && yendor::check(c2)) {
return false;
}
if(isWatery(c2) && !nonAdjacentPlayer(cwt.c,c2) && !c2->monst && cwt.c->wall == waBoat) {
if(havePushConflict(cwt.c, checkonly)) return false;
@ -6712,9 +6716,6 @@ bool movepcto(int d, int subdir, bool checkonly) {
addMessage("Are you sure you want to step there?");
return false;
}
if(c2->item == itOrbYendor && !boatmove && !checkonly && !peace::on && yendor::check(c2)) {
return false;
}
if(monstersnear(c2, NULL, moPlayer, NULL, cwt.c)) {
if(checkonly) return false;