diff --git a/game.cpp b/game.cpp index 92934b8c..9af11a48 100644 --- a/game.cpp +++ b/game.cpp @@ -851,13 +851,13 @@ bool passable_for(eMonster m, cell *w, cell *from, flagtype extra) { if(extra & P_ONPLAYER) { if(isPlayerOn(w)) return true; } - return !ctof(w) && passable(w, from, extra); + return !pseudohept(w) && passable(w, from, extra); } if(m == moAltDemon) { if(extra & P_ONPLAYER) { if(isPlayerOn(w)) return true; } - return (!w || !from || w==from || ctof(w) || ctof(from)) && passable(w, from, extra); + return (!w || !from || w==from || pseudohept(w) || pseudohept(from)) && passable(w, from, extra); } if(m == moMonk) { if(extra & P_ONPLAYER) { diff --git a/landgen.cpp b/landgen.cpp index 3f4dbbce..d3e6563f 100644 --- a/landgen.cpp +++ b/landgen.cpp @@ -97,7 +97,7 @@ bool out_ruin(cell *c) { eMonster genRuinMonster(cell *c) { eMonster m = pick(moHexDemon, moHexDemon, moHexDemon, moAltDemon, moAltDemon, moMonk, moMonk, moSkeleton, moSkeleton, moCrusher); - if(m == moHexDemon && ctof(c)) + if(m == moHexDemon && pseudohept(c)) return genRuinMonster(c); if(m == moMonk) { if(c->item) return genRuinMonster(c);