diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-05 16:07:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-05 16:07:44 +0300 |
| commit | 8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d (patch) | |
| tree | 5cc8d0097ce680cca550216e2313d1d1cb550cfc /src/resources/db/monsterdb.cpp | |
| parent | 3aaf10f021303dd67a2c36bf23f380348b5bdf02 (diff) | |
| download | manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.gz manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.bz2 manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.tar.xz manaplus-8480ff2ce8ac1ce1ceba024eddfaeb62a5d20f8d.zip | |
Rename walkMask into blockWalkMask.
Diffstat (limited to 'src/resources/db/monsterdb.cpp')
| -rw-r--r-- | src/resources/db/monsterdb.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index a78707571..7897d6198 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -97,10 +97,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName) if (!currentInfo) currentInfo = new BeingInfo; - currentInfo->setWalkMask(BlockMask::WALL - | BlockMask::CHARACTER | BlockMask::MONSTER); currentInfo->setBlockType(BlockType::MONSTER); - currentInfo->setName(XML::langProperty( // TRANSLATORS: unknown info name monsterNode, "name", _("unnamed"))); @@ -127,7 +124,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName) else if (walkStr == "walkswim" || walkStr == "swimwalk") block = BlockMask::AIR; - currentInfo->setWalkMask(static_cast<unsigned char>( + currentInfo->setBlockWalkMask(static_cast<unsigned char>( BlockMask::WALL | block)); if (currentInfo->getMaxHP()) |