From b7a150f324d1c00b75e5a7d532d3ca7ab672cb2e Mon Sep 17 00:00:00 2001 From: Alejandro Mujica Date: Sat, 13 Apr 2019 18:31:57 -0400 Subject: [PATCH] Important updates You're now able to use runes and spells on blocking items that are movable #30 Spell effects no longer appear on stairs like RealOTS. --- src/combat.cpp | 6 +++++- src/spells.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/combat.cpp b/src/combat.cpp index 11b32ee..05dda4e 100644 --- a/src/combat.cpp +++ b/src/combat.cpp @@ -175,7 +175,11 @@ ReturnValue Combat::canDoCombat(Creature* caster, Tile* tile, bool aggressive) return RETURNVALUE_NOTENOUGHROOM; } - if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKSOLID) && tile->hasProperty(CONST_PROP_UNLAY)) { + /*if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKSOLID) && tile->hasProperty(CONST_PROP_UNLAY)) { + return RETURNVALUE_NOTENOUGHROOM; + }*/ + + if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKPATH)) { return RETURNVALUE_NOTENOUGHROOM; } diff --git a/src/spells.cpp b/src/spells.cpp index 9f391fd..4592a24 100644 --- a/src/spells.cpp +++ b/src/spells.cpp @@ -692,7 +692,7 @@ bool Spell::playerRuneSpellCheck(Player* player, const Position& toPos) player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF); return false; - } else if (blockingSolid && tile->hasFlag(TILESTATE_BLOCKSOLID)) { + } else if (blockingSolid && tile->hasProperty(CONST_PROP_BLOCKPROJECTILE) && tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKSOLID)) { player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF); return false;