Merged revisions 4013,4027,4043,4174,4250,4254 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk

........
  r4013 | crush_tmw | 2008-04-01 01:18:19 +0200 (Di, 01 Apr 2008) | 1 line
  
  Implemented NPC XML database which maps NPC IDs to one or more animation files and thus enables animated NPCs.
........
  r4027 | crush_tmw | 2008-04-02 01:34:14 +0200 (Mi, 02 Apr 2008) | 1 line
  
  misspelled filename
........
  r4043 | b_lindeijer | 2008-04-07 10:37:23 +0200 (Mo, 07 Apr 2008) | 3 lines
  
  Added XML::Document class which simplifies parsing an XML document and
  automatically cleans it up again.
........
  r4174 | b_lindeijer | 2008-04-23 14:57:45 +0200 (Mi, 23 Apr 2008) | 2 lines
  
  Fixed svn:keywords properties and added header to guild.h.
........
  r4250 | crush_tmw | 2008-05-19 18:18:38 +0200 (Mo, 19 Mai 2008) | 1 line
  
  Added the possibility to add particle effects to NPCs in npcs.xml.
........
  r4254 | crush_tmw | 2008-05-20 15:58:26 +0200 (Di, 20 Mai 2008) | 1 line
  
  fixed some filename confusion messup in the last commit.
........


NOTE: This was my first commit using svnmerge. Please check if I did everything correctly.

1 files changed, 3 insertions, 19 deletions

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 9d64534c..e8ad393b 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -59,26 +59,12 @@ void ItemDB::load()
     mUnknown->setSprite("error.xml", 0);
     mUnknown->setSprite("error.xml", 1);
 
-    ResourceManager *resman = ResourceManager::getInstance();
-    int size;
-    char *data = (char*) resman->loadFile("items.xml", size);
+    XML::Document doc("items.xml");
+    xmlNodePtr rootNode = doc.rootNode();
 
-    if (!data) {
-        logger->error("ItemDB: Could not find items.xml!");
-    }
-
-    xmlDocPtr doc = xmlParseMemory(data, size);
-    free(data);
-
-    if (!doc)
-    {
-        logger->error("ItemDB: Error while parsing item database (items.xml)!");
-    }
-
-    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
     {
-        logger->error("ItemDB: items.xml is not a valid database file!");
+        logger->error("ItemDB: Error while loading items.xml!");
     }
 
     for_each_xml_child_node(node, rootNode)
@@ -150,8 +136,6 @@ void ItemDB::load()
 #undef CHECK_PARAM
     }
 
-    xmlFreeDoc(doc);
-
     mLoaded = true;
 }