diff --git a/orbgen.cpp b/orbgen.cpp index 8d115f79..68ba3f7b 100644 --- a/orbgen.cpp +++ b/orbgen.cpp @@ -264,8 +264,8 @@ eOrbLandRelation getOLR(eItem it, eLand l) { return olrDangerous; if(it == itOrbMatter) - if(l == laCaves || l == laEmerald || l == laAlchemist || l == laCaribbean || - l == laMinefield || l == laCocytus) return olrUseless; + if(among(l, laCaves, laEmerald, laAlchemist, laCaribbean, laMinefield, laCocytus, laWestWall)) + return olrUseless; if(l == laPrincessQuest) if(among(it, itOrbAether, itOrbFlash, itOrbTeleport, itOrbSummon, itOrbFreedom, itOrbFriend, itOrbPhasing)) diff --git a/orbs.cpp b/orbs.cpp index 3922a041..e183e0b3 100644 --- a/orbs.cpp +++ b/orbs.cpp @@ -829,6 +829,7 @@ void summonAt(cell *dest) { } bool tempWallPossibleAt(cell *dest) { + if(dest->land == laWestWall) return false; if(dest->monst || (dest->item && !itemHidden(dest))) return false; return dest->wall == waChasm || isWatery(dest) || dest->wall == waNone || dest->wall == waTempBridge;