fixed some filename confusion messup in the last commit.

2 files changed, 19 insertions, 172 deletions

diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 589effa9..bc1c920e 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -45,7 +45,7 @@ void NPCDB::load()
     NPCsprite *unknownSprite = new NPCsprite;
     unknownSprite->sprite = "error.xml";
     unknownSprite->variant = 0;
-    mUnknown.push_back(unknownSprite);
+    mUnknown.sprites.push_back(unknownSprite);
 
     logger->log("Initializing NPC database...");
 
@@ -74,17 +74,20 @@ void NPCDB::load()
 
         for_each_xml_child_node(spriteNode, npcNode)
         {
-            if (!xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
-                continue;
-
-            NPCsprite *currentSprite = new NPCsprite;
-            currentSprite->sprite = (const char*)spriteNode->xmlChildrenNode->content;
-            currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);
-            currentInfo->push_back(currentSprite);
+            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+            {
+                NPCsprite *currentSprite = new NPCsprite;
+                currentSprite->sprite = (const char*)spriteNode->xmlChildrenNode->content;
+                currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);
+                currentInfo->sprites.push_back(currentSprite);
+            }
+            else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
+            {
+                std::string particlefx = (const char*)spriteNode->xmlChildrenNode->content;
+                currentInfo->particles.push_back(particlefx);
+            }
         }
-
         mNPCInfos[id] = currentInfo;
-
     }
 
     mLoaded = true;
@@ -97,20 +100,20 @@ NPCDB::unload()
             i != mNPCInfos.end();
             i++)
     {
-        while (!i->second->empty())
+        while (!i->second->sprites.empty())
         {
-            delete i->second->front();
-            i->second->pop_front();
+            delete i->second->sprites.front();
+            i->second->sprites.pop_front();
         }
         delete i->second;
     }
 
     mNPCInfos.clear();
 
-    while (!mUnknown.empty())
+    while (!mUnknown.sprites.empty())
     {
-        delete mUnknown.front();
-        mUnknown.pop_front();
+        delete mUnknown.sprites.front();
+        mUnknown.sprites.pop_front();
     }
 
     mLoaded = false;
diff --git a/src/resources/npcdp.cpp b/src/resources/npcdp.cpp
deleted file mode 100644
index bce3bc10..00000000
--- a/src/resources/npcdp.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*

- *  The Mana World

- *  Copyright 2008 The Mana World Development Team

- *

- *  This file is part of The Mana World.

- *

- *  The Mana World is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation; either version 2 of the License, or

- *  any later version.

- *

- *  The Mana World is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with The Mana World; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

- *  $Id: monsterdb.cpp 3999 2008-03-23 01:27:13Z b_lindeijer $

- */

-

-#include "npcdb.h"

-

-#include "resourcemanager.h"

-

-#include "../log.h"

-

-#include "../utils/dtor.h"

-#include "../utils/xml.h"

-

-namespace

-{

-    NPCInfos mNPCInfos;

-    NPCInfo mUnknown;

-    bool mLoaded = false;

-}

-

-void NPCDB::load()

-{

-    if (mLoaded)

-    return;

-

-    NPCsprite *unknownSprite = new NPCsprite;

-    unknownSprite->sprite = "error.xml";

-    unknownSprite->variant = 0;

-    mUnknown.sprites.push_back(unknownSprite);

-

-    logger->log("Initializing NPC database...");

-

-    ResourceManager *resman = ResourceManager::getInstance();

-    int size;

-    char *data = (char*)resman->loadFile("npcs.xml", size);

-

-    if (!data)

-    {

-        logger->error("NPC Database: Could not find npcs.xml!");

-    }

-

-    xmlDocPtr doc = xmlParseMemory(data, size);

-    free(data);

-

-    if (!doc)

-    {

-        logger->error("NPC Database: Error while parsing NPC database (npcs.xml)!");

-    }

-

-    xmlNodePtr rootNode = xmlDocGetRootElement(doc);

-    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs"))

-    {

-        logger->error("NPC Database: npcs.xml is not a valid database file!");

-    }

-

-    //iterate <monster>s

-    for_each_xml_child_node(npcNode, rootNode)

-    {

-        if (!xmlStrEqual(npcNode->name, BAD_CAST "npc"))

-            continue;

-

-        int id = XML::getProperty(npcNode, "id", 0);

-        if (id == 0)

-        {

-            logger->log("NPC Database: NPC with missing ID in npcs.xml!");

-            continue;

-        }

-

-        NPCInfo *currentInfo = new NPCInfo;

-

-        for_each_xml_child_node(spriteNode, npcNode)

-        {

-            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))

-            {

-                NPCsprite *currentSprite = new NPCsprite;

-                currentSprite->sprite = (const char*)spriteNode->xmlChildrenNode->content;

-                currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);

-                currentInfo->sprites.push_back(currentSprite);

-            }

-            else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))

-            {

-                std::string particlefx = (const char*)spriteNode->xmlChildrenNode->content;

-                currentInfo->particles.push_back(particlefx);

-            }

-        }

-

-        mNPCInfos[id] = currentInfo;

-

-    }

-

-    xmlFreeDoc(doc);

-

-    mLoaded = true;

-}

-

-void

-NPCDB::unload()

-{

-    for (   NPCInfosIterator i = mNPCInfos.begin();

-            i != mNPCInfos.end();

-            i++)

-    {

-        while (!i->second->sprites.empty())

-        {

-            delete i->second->sprites.front();

-            i->second->sprites.pop_front();

-        }

-        delete i->second;

-    }

-

-    mNPCInfos.clear();

-

-    while (!mUnknown.sprites.empty())

-    {

-        delete mUnknown.sprites.front();

-        mUnknown.sprites.pop_front();

-    }

-

-    mLoaded = false;

-}

-

-const NPCInfo&

-NPCDB::get (int id)

-{

-    NPCInfosIterator i = mNPCInfos.find(id);

-

-    if (i == mNPCInfos.end())

-    {

-        logger->log("NPCDB: Warning, unknown NPC ID %d requested", id);

-        return mUnknown;

-    }

-    else

-    {

-        return *(i->second);

-    }

-}

-