Implemented NPC XML database which maps NPC IDs to one or more animation files and thus enables animated NPCs.

5 files changed, 230 insertions, 5 deletions

diff --git a/src/main.cpp b/src/main.cpp
index eea47394..7d550571 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -89,6 +89,7 @@
 #include "resources/image.h"
 #include "resources/itemdb.h"
 #include "resources/monsterdb.h"
+#include "resources/npcdb.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
@@ -367,6 +368,7 @@ void exit_engine()
     // Unload XML databases
     ItemDB::unload();
     MonsterDB::unload();
+    NPCDB::unload();
 
     ResourceManager::deleteInstance();
 }
@@ -910,6 +912,7 @@ int main(int argc, char *argv[])
                         // Load XML databases
                         ItemDB::load();
                         MonsterDB::load();
+                        NPCDB::load();
                         state = STATE_LOGIN;
                         break;
 
diff --git a/src/npc.cpp b/src/npc.cpp
index 8e0b00a5..9336986d 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -29,14 +29,29 @@
 #include "gui/gui.h"
 #include "net/messageout.h"
 #include "net/gameserver/player.h"
+#include "resources/npcdb.h"
 
 NPC *current_npc = 0;
 
-NPC::NPC(Uint16 id, Uint16 job, Map *map):
-    Being(id, job, map)
+NPC::NPC(Uint16 id, int sprite, Map *map):
+    Being(id, sprite, map)
 {
-    mSprites[BASE_SPRITE] = AnimatedSprite::load("graphics/sprites/npc.xml",
-            job - 100);
+    NPCInfo info = NPCDB::get(sprite);
+    int c = BASE_SPRITE;
+
+    for (NPCInfo::const_iterator i = info.begin();
+         i != info.end();
+         i++)
+    {
+        if (c == VECTOREND_SPRITE) break;
+
+        std::string file = "graphics/sprites/" + (*i)->sprite;
+        int variant = (*i)->variant;
+        mSprites[c] = AnimatedSprite::load(file, variant);
+        c++;
+    }
+
+    mName = "NPC";
 }
 
 Being::Type
diff --git a/src/npc.h b/src/npc.h
index 17ebd537..561ad9f0 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -31,7 +31,7 @@ class Graphics;
 class NPC : public Being
 {
     public:
-        NPC(Uint16 id, Uint16 job, Map *map);
+        NPC(Uint16 id, int sprite, Map *map);
 
         virtual Type
         getType() const;
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
new file mode 100644
index 00000000..30431e59
--- /dev/null
+++ b/src/resources/npcdb.h
@@ -0,0 +1,56 @@
+/*

+ *  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.h 3456 2007-08-13 21:09:12Z gmelquio $

+ */

+

+#ifndef _TMW_NPC_DB_H

+#define _TMW_NPC_DB_H

+

+#include <map>

+#include <list>

+#include <string>

+

+struct NPCsprite

+{

+    std::string sprite;

+    int variant;

+};

+

+typedef std::list<NPCsprite*> NPCInfo;

+typedef std::map<int, NPCInfo*> NPCInfos;

+

+/**

+ * NPC information database.

+ */

+namespace NPCDB

+{

+    void

+    load();

+

+    void

+    unload();

+

+    const NPCInfo& get(int id);

+

+    typedef NPCInfos::iterator NPCInfosIterator;

+}

+

+#endif

diff --git a/src/resources/npcdp.cpp b/src/resources/npcdp.cpp
new file mode 100644
index 00000000..e60431c3
--- /dev/null
+++ b/src/resources/npcdp.cpp
@@ -0,0 +1,151 @@
+/*

+ *  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.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"))

+                continue;

+

+            NPCsprite *currentSprite = new NPCsprite;

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

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

+            currentInfo->push_back(currentSprite);

+        }

+

+        mNPCInfos[id] = currentInfo;

+

+    }

+

+    xmlFreeDoc(doc);

+

+    mLoaded = true;

+}

+

+void

+NPCDB::unload()

+{

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

+            i != mNPCInfos.end();

+            i++)

+    {

+        while (!i->second->empty())

+        {

+            delete i->second->front();

+            i->second->pop_front();

+        }

+        delete i->second;

+    }

+

+    mNPCInfos.clear();

+

+    while (!mUnknown.empty())

+    {

+        delete mUnknown.front();

+        mUnknown.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);

+    }

+}

+