Added the possibility to add particle effects to NPCs in npcs.xml.

3 files changed, 175 insertions, 5 deletions

diff --git a/src/npc.cpp b/src/npc.cpp
index 9336986d..c2b266ff 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -25,6 +25,7 @@
 
 #include "animatedsprite.h"
 #include "graphics.h"
+#include "particle.h"
 
 #include "gui/gui.h"
 #include "net/messageout.h"
@@ -37,10 +38,11 @@ NPC::NPC(Uint16 id, int sprite, Map *map):
     Being(id, sprite, map)
 {
     NPCInfo info = NPCDB::get(sprite);
-    int c = BASE_SPRITE;
 
-    for (NPCInfo::const_iterator i = info.begin();
-         i != info.end();
+    //setup NPC sprites
+    int c = BASE_SPRITE;
+    for (std::list<NPCsprite*>::const_iterator i = info.sprites.begin();
+         i != info.sprites.end();
          i++)
     {
         if (c == VECTOREND_SPRITE) break;
@@ -51,7 +53,14 @@ NPC::NPC(Uint16 id, int sprite, Map *map):
         c++;
     }
 
-    mName = "NPC";
+    //setup particle effects
+    for (std::list<std::string>::const_iterator i = info.particles.begin();
+         i != info.particles.end();
+         i++)
+    {
+        Particle *p = particleEngine->addEffect(*i, 0, 0, 0);
+        this->controlParticle(p);
+    }
 }
 
 Being::Type
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 62ac9f48..2abf959b 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -34,7 +34,12 @@ struct NPCsprite
     int variant;
 };
 
-typedef std::list<NPCsprite*> NPCInfo;
+struct NPCInfo
+{
+    std::list<NPCsprite*> sprites;
+    std::list<std::string> particles;
+};
+
 typedef std::map<int, NPCInfo*> NPCInfos;
 
 /**
diff --git a/src/resources/npcdp.cpp b/src/resources/npcdp.cpp
new file mode 100644
index 00000000..bce3bc10
--- /dev/null
+++ b/src/resources/npcdp.cpp
@@ -0,0 +1,156 @@
+/*

+ *  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);

+    }

+}

+