diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-23 22:06:33 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-24 19:08:09 +0100 |
commit | a3dc6e19b1cb7eec1dcbbcef5d370f4ab55a9ade (patch) | |
tree | 91b7bd840756eff88d59617054854d55bb5910d2 /src/game-server/monstermanager.cpp | |
parent | 94d97450bc3a52cd90baa696320bd08d91ac301f (diff) | |
download | manaserv-a3dc6e19b1cb7eec1dcbbcef5d370f4ab55a9ade.tar.gz manaserv-a3dc6e19b1cb7eec1dcbbcef5d370f4ab55a9ade.tar.bz2 manaserv-a3dc6e19b1cb7eec1dcbbcef5d370f4ab55a9ade.tar.xz manaserv-a3dc6e19b1cb7eec1dcbbcef5d370f4ab55a9ade.zip |
Rely more on the functionality in XML::Document
By default XML::Document will use the ResourceManager to resolve the
file name you pass to it. There is no point in disabling that
functionality only to resolve it manually.
Reviewed-by: Jared Adams
Diffstat (limited to 'src/game-server/monstermanager.cpp')
-rw-r--r-- | src/game-server/monstermanager.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp index 5fb0b675..cef6b7db 100644 --- a/src/game-server/monstermanager.cpp +++ b/src/game-server/monstermanager.cpp @@ -20,7 +20,6 @@ #include "game-server/monstermanager.h" -#include "common/resourcemanager.h" #include "game-server/attributemanager.h" #include "game-server/itemmanager.h" #include "game-server/monster.h" @@ -60,24 +59,17 @@ void MonsterManager::initialize() void MonsterManager::reload() { - std::string absPathFile = ResourceManager::resolve(mMonsterReferenceFile); - if (absPathFile.empty()) { - LOG_ERROR("Monster Manager: Could not find " - << mMonsterReferenceFile << "!"); - return; - } - - XML::Document doc(absPathFile, false); + XML::Document doc(mMonsterReferenceFile); xmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters")) { LOG_ERROR("Monster Manager: Error while parsing monster database (" - << absPathFile << ")!"); + << mMonsterReferenceFile << ")!"); return; } - LOG_INFO("Loading monster reference: " << absPathFile); + LOG_INFO("Loading monster reference: " << mMonsterReferenceFile); int nbMonsters = 0; for_each_xml_child_node(node, rootNode) { |