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/itemmanager.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/itemmanager.cpp')
-rw-r--r-- | src/game-server/itemmanager.cpp | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp index b9ac2feb..ab9d511e 100644 --- a/src/game-server/itemmanager.cpp +++ b/src/game-server/itemmanager.cpp @@ -21,7 +21,6 @@ #include "game-server/itemmanager.h" #include "common/defines.h" -#include "common/resourcemanager.h" #include "game-server/attributemanager.h" #include "game-server/item.h" #include "game-server/skillmanager.h" @@ -121,23 +120,17 @@ bool ItemManager::isEquipSlotVisible(unsigned int id) const void ItemManager::readEquipSlotsFile() { - std::string absPathFile = ResourceManager::resolve(mEquipSlotsFile); - if (absPathFile.empty()) { - LOG_ERROR("Item Manager: Could not find " << mEquipSlotsFile << "!"); - return; - } - - XML::Document doc(absPathFile, false); + XML::Document doc(mEquipSlotsFile); xmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "equip-slots")) { LOG_ERROR("Item Manager: Error while parsing equip slots database (" - << absPathFile << ")!"); + << mEquipSlotsFile << ")!"); return; } - LOG_INFO("Loading equip slots: " << absPathFile); + LOG_INFO("Loading equip slots: " << mEquipSlotsFile); unsigned totalCount = 0; unsigned slotCount = 0; @@ -179,24 +172,17 @@ void ItemManager::readEquipSlotsFile() void ItemManager::readItemsFile() { - std::string absPathFile = ResourceManager::resolve(mItemsFile); - if (absPathFile.empty()) - { - LOG_ERROR("Item Manager: Could not find " << mItemsFile << "!"); - return; - } - - XML::Document doc2(absPathFile, false); + XML::Document doc2(mItemsFile); xmlNodePtr rootNode = doc2.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items")) { LOG_ERROR("Item Manager: Error while parsing item database (" - << absPathFile << ")!"); + << mItemsFile << ")!"); return; } - LOG_INFO("Loading item reference: " << absPathFile); + LOG_INFO("Loading item reference: " << mItemsFile); for_each_xml_child_node(node, rootNode) { @@ -207,7 +193,7 @@ void ItemManager::readItemsFile() } LOG_INFO("Loaded " << mItemClasses.size() << " items from " - << absPathFile << "."); + << mItemsFile << "."); } void ItemManager::readItemNode(xmlNodePtr itemNode) |