summaryrefslogtreecommitdiff
path: root/src/game-server/monstermanager.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-06-06 17:58:25 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-06-06 18:02:19 +0200
commit477643d60f9e88ecc99d1a9fff54dce0d9b55c29 (patch)
tree8dd57b1e9eca74a63cea0840b674e85e2064bc0c /src/game-server/monstermanager.cpp
parentde81e609cfff934fbae1b45968e7418ab714c70f (diff)
downloadmanaserv-477643d60f9e88ecc99d1a9fff54dce0d9b55c29.tar.gz
manaserv-477643d60f9e88ecc99d1a9fff54dce0d9b55c29.tar.bz2
manaserv-477643d60f9e88ecc99d1a9fff54dce0d9b55c29.tar.xz
manaserv-477643d60f9e88ecc99d1a9fff54dce0d9b55c29.zip
Arbitrary cleanups and marked GameHandler::getClientByNameSlow const
Diffstat (limited to 'src/game-server/monstermanager.cpp')
-rw-r--r--src/game-server/monstermanager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index 45772c65..3ad033f6 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -112,8 +112,7 @@ void MonsterManager::reload()
bool attributesSet = false;
bool behaviorSet = false;
- for (xmlNodePtr subnode = node->xmlChildrenNode; subnode != NULL;
- subnode = subnode->next)
+ for_each_xml_child_node(subnode, node)
{
if (xmlStrEqual(subnode->name, BAD_CAST "drop"))
{
@@ -286,5 +285,5 @@ void MonsterManager::deinitialize()
MonsterClass *MonsterManager::getMonster(int id)
{
MonsterClasses::const_iterator i = monsterClasses.find(id);
- return i != monsterClasses.end() ? i->second : NULL;
+ return i != monsterClasses.end() ? i->second : 0;
}