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, 5 insertions, 25 deletions

diff --git a/src/particle.cpp b/src/particle.cpp
index 3d6b723d..f58a26f1 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -217,35 +217,17 @@ Particle::addEffect(const std::string &particleEffectFile,
 {
     Particle *newParticle = NULL;
 
-    // XML parser initialisation stuff
-    int size;
-    ResourceManager *resman = ResourceManager::getInstance();
-    char *data = (char*) resman->loadFile(particleEffectFile.c_str(), size);
-
-    if (!data) {
-        logger->log("Warning: Particle engine could not find %s !",
-                    particleEffectFile.c_str());
-        return NULL;
-    }
-
-    xmlDocPtr doc = xmlParseMemory(data, size);
-    free(data);
+    XML::Document doc(particleEffectFile);
+    xmlNodePtr rootNode = doc.rootNode();
 
-    if (!doc) {
-        logger->log("Warning: Particle engine found syntax error in %s!",
-                    particleEffectFile.c_str());
-        return NULL;
-    }
-
-    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "effect"))
     {
-        logger->log("Warning: %s is not a valid particle effect definition file!",
-                    particleEffectFile.c_str());
-        xmlFreeDoc(doc);
+        logger->log("Error loading particle: %s", particleEffectFile.c_str());
         return NULL;
     }
 
+    ResourceManager *resman = ResourceManager::getInstance();
+
     // Parse particles
     for_each_xml_child_node(effectChildNode, rootNode)
     {
@@ -302,8 +284,6 @@ Particle::addEffect(const std::string &particleEffectFile,
         mChildParticles.push_back(newParticle);
     }
 
-    xmlFreeDoc(doc);
-
     return newParticle;
 }