diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-05-10 03:54:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-05-10 03:54:02 +0300 |
| commit | d96276ef080494ef41e293a010d1c4cf376baf37 (patch) | |
| tree | 5ad2a290f1bf7978455549a932950b590759a682 | |
| parent | ba10e1e470ed1f351af3e0ab380e0bc225c8332d (diff) | |
| download | plus-d96276ef080494ef41e293a010d1c4cf376baf37.tar.gz plus-d96276ef080494ef41e293a010d1c4cf376baf37.tar.bz2 plus-d96276ef080494ef41e293a010d1c4cf376baf37.tar.xz plus-d96276ef080494ef41e293a010d1c4cf376baf37.zip | |
Dont prevent animation from players and monsters in special collisions.
| -rw-r--r-- | src/resources/beinginfo.cpp | 3 | ||||
| -rw-r--r-- | src/resources/monsterdb.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 438de46dd..96cc47f94 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -33,8 +33,7 @@ BeingInfo::BeingInfo(): mName(_("unnamed")), mTargetCursorSize(ActorSprite::TC_MEDIUM), mWalkMask(Map::BLOCKMASK_WALL | Map::BLOCKMASK_CHARACTER - | Map::BLOCKMASK_MONSTER | Map::BLOCKMASK_AIR - | Map::BLOCKMASK_WATER), + | Map::BLOCKMASK_MONSTER), mBlockType(Map::BLOCKTYPE_CHARACTER), mTargetOffsetX(0), mTargetOffsetY(0), mMaxHP(0), mStaticMaxHP(false) diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 5a80b4500..2f60cd307 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -71,8 +71,7 @@ void MonsterDB::load() BeingInfo *currentInfo = new BeingInfo; currentInfo->setWalkMask(Map::BLOCKMASK_WALL - | Map::BLOCKMASK_CHARACTER | Map::BLOCKMASK_MONSTER - | Map::BLOCKMASK_AIR | Map::BLOCKMASK_WATER); + | Map::BLOCKMASK_CHARACTER | Map::BLOCKMASK_MONSTER); currentInfo->setBlockType(Map::BLOCKTYPE_MONSTER); currentInfo->setName(XML::getProperty( |