summaryrefslogtreecommitdiff
path: root/src/resources/monsterdb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/monsterdb.cpp')
-rw-r--r--src/resources/monsterdb.cpp25
1 files changed, 19 insertions, 6 deletions
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index fbd7d10ad..ac5b2c7f9 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -82,16 +82,29 @@ void MonsterDB::load()
monsterNode, "name", _("unnamed")));
currentInfo->setTargetCursorSize(XML::getProperty(monsterNode,
- "targetCursor", "medium"));
+ "targetCursor", "medium"));
currentInfo->setTargetOffsetX(XML::getProperty(monsterNode,
- "targetOffsetX", 0));
+ "targetOffsetX", 0));
currentInfo->setTargetOffsetY(XML::getProperty(monsterNode,
- "targetOffsetY", 0));
-
- currentInfo->setMaxHP(XML::getProperty(monsterNode,
- "maxHP", 0));
+ "targetOffsetY", 0));
+
+ currentInfo->setMaxHP(XML::getProperty(monsterNode, "maxHP", 0));
+
+ unsigned char block = 0;
+ std::string walkStr = XML::getProperty(
+ monsterNode, "walkType", "walk");
+ if (walkStr == "walk")
+ block = Map::BLOCKMASK_WATER | Map::BLOCKMASK_AIR;
+ else if (walkStr == "fly")
+ block = 0;
+ else if (walkStr == "swim")
+ block = Map::BLOCKMASK_GROUND | Map::BLOCKMASK_AIR;
+ else if (walkStr == "walkswim" || walkStr == "swimwalk")
+ block = Map::BLOCKMASK_AIR;
+
+ currentInfo->setWalkMask(Map::BLOCKMASK_WALL | block);
if (currentInfo->getMaxHP())
currentInfo->setStaticMaxHP(true);