Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-05-01 10:09:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Important updates

Browse Source 
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.
This commit is contained in:
Alejandro Mujica 2019-04-13 18:31:57 -04:00
parent 76c925111d
commit b7a150f324
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/combat.cpp
View File

@ -175,7 +175,11 @@ ReturnValue Combat::canDoCombat(Creature* caster, Tile* tile, bool aggressive)
return RETURNVALUE_NOTENOUGHROOM; 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; return RETURNVALUE_NOTENOUGHROOM;
} }

2
src/spells.cpp
View File

@ -692,7 +692,7 @@ bool Spell::playerRuneSpellCheck(Player* player, const Position& toPos)
player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM);
g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF); g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF);
return false; 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); player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM);
g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF); g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF);
return false; return false;