diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-11 17:00:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-11 17:00:44 +0300 |
| commit | 10cf17f8d83d2d925641f722acc004828dba3094 (patch) | |
| tree | 46a746d5bfe79e067cd25a3caca476ecbafa0af5 /src/resources/db | |
| parent | 77bb74bd2d944be1a1dc719027dbf37ad088b828 (diff) | |
| download | manaplus-10cf17f8d83d2d925641f722acc004828dba3094.tar.gz manaplus-10cf17f8d83d2d925641f722acc004828dba3094.tar.bz2 manaplus-10cf17f8d83d2d925641f722acc004828dba3094.tar.xz manaplus-10cf17f8d83d2d925641f722acc004828dba3094.zip | |
Move blockmask into separate file.
Diffstat (limited to 'src/resources/db')
| -rw-r--r-- | src/resources/db/monsterdb.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 8f11f2411..0fe02a99f 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -96,8 +96,8 @@ void MonsterDB::loadXmlFile(const std::string &fileName) if (!currentInfo) currentInfo = new BeingInfo; - currentInfo->setWalkMask(Map::BLOCKMASK_WALL - | Map::BLOCKMASK_CHARACTER | Map::BLOCKMASK_MONSTER); + currentInfo->setWalkMask(BlockMask::WALL + | BlockMask::CHARACTER | BlockMask::MONSTER); currentInfo->setBlockType(BlockType::MONSTER); currentInfo->setName(XML::langProperty( @@ -118,16 +118,16 @@ void MonsterDB::loadXmlFile(const std::string &fileName) std::string walkStr = XML::getProperty( monsterNode, "walkType", "walk"); if (walkStr == "walk") - block = Map::BLOCKMASK_WATER | Map::BLOCKMASK_AIR; + block = BlockMask::WATER | BlockMask::AIR; else if (walkStr == "fly") block = 0; else if (walkStr == "swim") - block = Map::BLOCKMASK_GROUND | Map::BLOCKMASK_AIR; + block = BlockMask::GROUND | BlockMask::AIR; else if (walkStr == "walkswim" || walkStr == "swimwalk") - block = Map::BLOCKMASK_AIR; + block = BlockMask::AIR; currentInfo->setWalkMask(static_cast<unsigned char>( - Map::BLOCKMASK_WALL | block)); + BlockMask::WALL | block)); if (currentInfo->getMaxHP()) currentInfo->setStaticMaxHP(true); |