diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-10-02 02:33:08 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-10-02 02:33:08 +0300 |
| commit | 8700635293ff1d39266f0c1a8a77d2d28ba4a241 (patch) | |
| tree | 18f6c103feca243b1b029fcb99faa643ffa51ac3 /src/resources/db/mercenarydb.cpp | |
| parent | b49ae828a16ea9ddd4a06c92f2a5ef719c652e11 (diff) | |
| download | manaplus-8700635293ff1d39266f0c1a8a77d2d28ba4a241.tar.gz manaplus-8700635293ff1d39266f0c1a8a77d2d28ba4a241.tar.bz2 manaplus-8700635293ff1d39266f0c1a8a77d2d28ba4a241.tar.xz manaplus-8700635293ff1d39266f0c1a8a77d2d28ba4a241.zip | |
Allow read "walkType" attributes from xml for all being types.
Diffstat (limited to 'src/resources/db/mercenarydb.cpp')
| -rw-r--r-- | src/resources/db/mercenarydb.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index cdd4c71e1..5ca92e347 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -105,21 +105,6 @@ void MercenaryDB::loadXmlFile(const std::string &fileName) currentInfo->setColorsList(XML::getProperty(mercenaryNode, "colors", "")); - unsigned char block = 0; - std::string walkStr = XML::getProperty( - mercenaryNode, "walkType", "walk"); - if (walkStr == "walk") - block = BlockMask::WATER | BlockMask::AIR; - else if (walkStr == "fly") - block = 0; - else if (walkStr == "swim") - block = BlockMask::GROUND | BlockMask::AIR; - else if (walkStr == "walkswim" || walkStr == "swimwalk") - block = BlockMask::AIR; - - currentInfo->setBlockWalkMask(static_cast<unsigned char>( - BlockMask::WALL | block)); - if (currentInfo->getMaxHP()) currentInfo->setStaticMaxHP(true); |