summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-02-06 16:53:16 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-02-06 16:53:16 +0000
commit402484c66f2cb4036e1af4bbda6345d8d79ecb41 (patch)
tree221469679d41d65ff0d207661b2ee01ac6bcd0d0 /src
parent983a8587fedec18e08a1d032a76784d8f9a18085 (diff)
downloadmanaserv-402484c66f2cb4036e1af4bbda6345d8d79ecb41.tar.gz
manaserv-402484c66f2cb4036e1af4bbda6345d8d79ecb41.tar.bz2
manaserv-402484c66f2cb4036e1af4bbda6345d8d79ecb41.tar.xz
manaserv-402484c66f2cb4036e1af4bbda6345d8d79ecb41.zip
obeying "80 characters per row" coding style rule.
Diffstat (limited to 'src')
-rw-r--r--src/game-server/monstermanager.cpp31
1 files changed, 21 insertions, 10 deletions
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index 2d59d690..58c146c3 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -122,14 +122,22 @@ void MonsterManager::reload()
else if (xmlStrEqual(subnode->name, BAD_CAST "attributes"))
{
attributesSet = true;
- monster->setAttribute(BASE_ATTR_HP, XML::getProperty(subnode, "hp", -1));
- monster->setAttribute(BASE_ATTR_PHY_ATK_MIN, XML::getProperty(subnode, "attack-min", -1));
- monster->setAttribute(BASE_ATTR_PHY_ATK_DELTA, XML::getProperty(subnode, "attack-delta", -1));
- monster->setAttribute(BASE_ATTR_MAG_ATK, XML::getProperty(subnode, "attack-magic", -1));
- monster->setAttribute(BASE_ATTR_EVADE, XML::getProperty(subnode, "evade", -1));
- monster->setAttribute(BASE_ATTR_HIT, XML::getProperty(subnode, "hit", -1));
- monster->setAttribute(BASE_ATTR_PHY_RES, XML::getProperty(subnode, "physical-defence", -1));
- monster->setAttribute(BASE_ATTR_MAG_RES, XML::getProperty(subnode, "magical-defence", -1));
+ monster->setAttribute(BASE_ATTR_HP,
+ XML::getProperty(subnode, "hp", -1));
+ monster->setAttribute(BASE_ATTR_PHY_ATK_MIN,
+ XML::getProperty(subnode, "attack-min", -1));
+ monster->setAttribute(BASE_ATTR_PHY_ATK_DELTA,
+ XML::getProperty(subnode, "attack-delta", -1));
+ monster->setAttribute(BASE_ATTR_MAG_ATK,
+ XML::getProperty(subnode, "attack-magic", -1));
+ monster->setAttribute(BASE_ATTR_EVADE,
+ XML::getProperty(subnode, "evade", -1));
+ monster->setAttribute(BASE_ATTR_HIT,
+ XML::getProperty(subnode, "hit", -1));
+ monster->setAttribute(BASE_ATTR_PHY_RES,
+ XML::getProperty(subnode, "physical-defence", -1));
+ monster->setAttribute(BASE_ATTR_MAG_RES,
+ XML::getProperty(subnode, "magical-defence", -1));
// TODO: speed
// TODO: size
@@ -143,12 +151,15 @@ void MonsterManager::reload()
monster->setAttribute(i, 0);
}
}
- if (!attributesComplete) LOG_WARN(monsterReferenceFile<<": Attributes incomplete for monster #"<<id);
+ if (!attributesComplete) LOG_WARN(monsterReferenceFile
+ <<": Attributes incomplete for monster #"<<id);
}
}
monster->setDrops(drops);
- if (!attributesSet) LOG_WARN(monsterReferenceFile<<": No attributes defined for monster #"<<id);
+ if (!attributesSet) LOG_WARN(monsterReferenceFile
+ <<": No attributes defined for monster #"
+ <<id);
++nbMonsters;
}