diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-10-15 21:53:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-10-15 22:18:24 +0300 |
| commit | 60580edaea11f6a39ef8786e6576110b81fa106c (patch) | |
| tree | 76444d3fd2bbf12eb870c4547491708c4ed2579b /src/resources | |
| parent | 870669f856c61c1a9e9c7b782cab412c4859be88 (diff) | |
| download | plus-60580edaea11f6a39ef8786e6576110b81fa106c.tar.gz plus-60580edaea11f6a39ef8786e6576110b81fa106c.tar.bz2 plus-60580edaea11f6a39ef8786e6576110b81fa106c.tar.xz plus-60580edaea11f6a39ef8786e6576110b81fa106c.zip | |
Remove CHARACTER and MONSTER block mask and block type because it unused.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/beinginfo.cpp | 4 | ||||
| -rw-r--r-- | src/resources/db/homunculusdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/db/mercenarydb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/db/monsterdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/map/map.cpp | 6 |
5 files changed, 4 insertions, 12 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 5a36892d9..79969e71e 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -54,11 +54,9 @@ BeingInfo::BeingInfo() : mAttacks(), mMenu(), mBlockWalkMask(BlockMask::WALL - | BlockMask::CHARACTER - | BlockMask::MONSTER | BlockMask::AIR | BlockMask::WATER), - mBlockType(BlockType::CHARACTER), + mBlockType(BlockType::NONE), mColors(nullptr), mTargetOffsetX(0), mTargetOffsetY(0), diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp index 4cf2671b4..67be7502d 100644 --- a/src/resources/db/homunculusdb.cpp +++ b/src/resources/db/homunculusdb.cpp @@ -92,7 +92,7 @@ void HomunculusDB::loadXmlFile(const std::string &fileName) if (!currentInfo) currentInfo = new BeingInfo; - currentInfo->setBlockType(BlockType::MONSTER); + currentInfo->setBlockType(BlockType::NONE); BeingCommon::readBasicAttributes(currentInfo, homunculusNode, "attack"); diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index 1d8d21173..59165f29c 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -92,7 +92,7 @@ void MercenaryDB::loadXmlFile(const std::string &fileName) if (!currentInfo) currentInfo = new BeingInfo; - currentInfo->setBlockType(BlockType::MONSTER); + currentInfo->setBlockType(BlockType::NONE); BeingCommon::readBasicAttributes(currentInfo, mercenaryNode, "attack"); currentInfo->setMaxHP(XML::getProperty(mercenaryNode, "maxHP", 0)); diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 813497b2a..47af5b557 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -95,7 +95,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName) if (!currentInfo) currentInfo = new BeingInfo; - currentInfo->setBlockType(BlockType::MONSTER); + currentInfo->setBlockType(BlockType::NONE); currentInfo->setName(XML::langProperty( // TRANSLATORS: unknown info name monsterNode, "name", _("unnamed"))); diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index bf32d9e0c..8ad0c5977 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -692,12 +692,6 @@ void Map::blockTile(const int x, const int y, case BlockType::WALL: mMetaTiles[tileNum].blockmask |= BlockMask::WALL; break; - case BlockType::CHARACTER: - mMetaTiles[tileNum].blockmask |= BlockMask::CHARACTER; - break; - case BlockType::MONSTER: - mMetaTiles[tileNum].blockmask |= BlockMask::MONSTER; - break; case BlockType::AIR: mMetaTiles[tileNum].blockmask |= BlockMask::AIR; break; |