summaryrefslogtreecommitdiff
path: root/src/resources/db/mercenarydb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/db/mercenarydb.cpp')
-rw-r--r--src/resources/db/mercenarydb.cpp15
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);