From a3dc6e19b1cb7eec1dcbbcef5d370f4ab55a9ade Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Wed, 23 Mar 2011 22:06:33 +0100
Subject: 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
---
 src/game-server/itemmanager.cpp | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'src/game-server/itemmanager.cpp')

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)
-- 
cgit v1.2.3-70-g09d2