Merged equipment database with items database and got rid of the unused item

art attribute. Removed the now unnecessary multiplication of weapon IDs with
10000. Added a fallback item icon and used it for unknown items or when an item
image fails to load.

1 files changed, 223 insertions, 149 deletions

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 7f30ebe6..cfc485cb 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -1,149 +1,223 @@
-/*

- *  The Mana World

- *  Copyright 2004 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$

- */

-

-#include "itemdb.h"

-

-#include <libxml/tree.h>

-

-#include "iteminfo.h"

-#include "resourcemanager.h"

-

-#include "../log.h"

-

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

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

-

-namespace

-{

-    ItemDB::ItemInfos mItemInfos;

-    ItemInfo mUnknown;

-    bool mLoaded = false;

-}

-

-

-void ItemDB::load()

-{

-    if (mLoaded)

-        return;

-

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

-    mUnknown.setName("Unknown item");

-

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

-    int size;

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

-

-    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!");

-    }

-

-    for_each_xml_child_node(node, rootNode)

-    {

-        if (!xmlStrEqual(node->name, BAD_CAST "item")) {

-            continue;

-        }

-

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

-        int art = XML::getProperty(node, "art", 0);

-        int type = XML::getProperty(node, "type", 0);

-        int weight = XML::getProperty(node, "weight", 0);

-        int slot = XML::getProperty(node, "slot", 0);

-

-        std::string name = XML::getProperty(node, "name", "");

-        std::string image = XML::getProperty(node, "image", "");

-        std::string description = XML::getProperty(node, "description", "");

-        std::string effect = XML::getProperty(node, "effect", "");

-

-        if (id && name != "")

-        {

-            ItemInfo *itemInfo = new ItemInfo();

-            itemInfo->setImage(image);

-            itemInfo->setArt(art);

-            itemInfo->setName(name);

-            itemInfo->setDescription(description);

-            itemInfo->setEffect(effect);

-            itemInfo->setType(type);

-            itemInfo->setWeight(weight);

-            itemInfo->setSlot(slot);

-            mItemInfos[id] = itemInfo;

-        }

-

-        if (id == 0)

-        {

-            logger->log("ItemDB: An item has no ID in items.xml!");

-        }

-

-#define CHECK_PARAM(param, error_value) \

-        if (param == error_value) \

-            logger->log("ItemDB: Missing" #param " parameter for item %i! %s", \

-                    id, name.c_str())

-

-        CHECK_PARAM(name, "");

-        CHECK_PARAM(image, "");

-        // CHECK_PARAM(art, 0);

-        // CHECK_PARAM(description, "");

-        // CHECK_PARAM(effect, "");

-        // CHECK_PARAM(type, 0);

-        CHECK_PARAM(weight, 0);

-        // CHECK_PARAM(slot, 0);

-

-#undef CHECK_PARAM

-    }

-

-    xmlFreeDoc(doc);

-

-    mLoaded = true;

-}

-

-void ItemDB::unload()

-{

-    for (ItemInfoIterator i = mItemInfos.begin(); i != mItemInfos.end(); i++)

-    {

-        delete i->second;

-    }

-    mItemInfos.clear();

-

-    mLoaded = false;

-}

-

-const ItemInfo&

-ItemDB::get(int id)

-{

-    ItemInfoIterator i = mItemInfos.find(id);

-

-    return (i != mItemInfos.end()) ? *(i->second) : mUnknown;

-}

+/*
+ *  The Mana World
+ *  Copyright 2004 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$
+ */
+
+#include <cassert>
+
+#include "itemdb.h"
+
+#include <libxml/tree.h>
+
+#include "iteminfo.h"
+#include "resourcemanager.h"
+
+#include "../log.h"
+
+#include "../utils/dtor.h"
+#include "../utils/xml.h"
+
+namespace
+{
+    ItemDB::ItemInfos mItemInfos;
+    ItemInfo *mUnknown;
+    bool mLoaded = false;
+}
+
+// Forward declarations
+static void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node);
+static void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node);
+
+void ItemDB::load()
+{
+    if (mLoaded)
+        return;
+
+    logger->log("Initializing item database...");
+
+    mUnknown = new ItemInfo();
+    mUnknown->setName("Unknown item");
+    mUnknown->setImage("");
+    mUnknown->setSprite("error.xml", 0);
+    mUnknown->setSprite("error.xml", 1);
+
+    ResourceManager *resman = ResourceManager::getInstance();
+    int size;
+    char *data = (char*) resman->loadFile("items.xml", size);
+
+    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!");
+    }
+
+    for_each_xml_child_node(node, rootNode)
+    {
+        if (!xmlStrEqual(node->name, BAD_CAST "item"))
+            continue;
+
+        int id = XML::getProperty(node, "id", 0);
+
+        if (id == 0)
+        {
+            logger->log("ItemDB: Invalid or missing item ID in items.xml!");
+            continue;
+        }
+        else if (mItemInfos.find(id) != mItemInfos.end())
+        {
+            logger->log("ItemDB: Redefinition of item ID %d", id);
+        }
+
+        int type = XML::getProperty(node, "type", 0);
+        int weight = XML::getProperty(node, "weight", 0);
+        int view = XML::getProperty(node, "view", 0);
+        int slot = XML::getProperty(node, "slot", 0);
+
+        std::string name = XML::getProperty(node, "name", "");
+        std::string image = XML::getProperty(node, "image", "");
+        std::string description = XML::getProperty(node, "description", "");
+        std::string effect = XML::getProperty(node, "effect", "");
+        std::string attackType = XML::getProperty(node, "attacktype", "");
+
+        if (id && name != "")
+        {
+            ItemInfo *itemInfo = new ItemInfo();
+            itemInfo->setImage(image);
+            itemInfo->setName(name);
+            itemInfo->setDescription(description);
+            itemInfo->setEffect(effect);
+            itemInfo->setType(type);
+            itemInfo->setView(view);
+            itemInfo->setWeight(weight);
+            itemInfo->setSlot(slot);
+            itemInfo->setAttackType(attackType);
+
+            for_each_xml_child_node(itemChild, node)
+            {
+                if (xmlStrEqual(itemChild->name, BAD_CAST "sprite"))
+                {
+                    loadSpriteRef(itemInfo, itemChild);
+                }
+                else if (xmlStrEqual(itemChild->name, BAD_CAST "sound"))
+                {
+                    loadSoundRef(itemInfo, itemChild);
+                }
+            }
+
+            mItemInfos[id] = itemInfo;
+        }
+
+#define CHECK_PARAM(param, error_value) \
+        if (param == error_value) \
+            logger->log("ItemDB: Missing " #param " attribute for item %i!",id)
+
+        CHECK_PARAM(name, "");
+        CHECK_PARAM(image, "");
+        // CHECK_PARAM(description, "");
+        // CHECK_PARAM(effect, "");
+        // CHECK_PARAM(type, 0);
+        CHECK_PARAM(weight, 0);
+        // CHECK_PARAM(slot, 0);
+
+#undef CHECK_PARAM
+    }
+
+    xmlFreeDoc(doc);
+
+    mLoaded = true;
+}
+
+void ItemDB::unload()
+{
+    logger->log("Unloading item database...");
+
+    delete mUnknown;
+    mUnknown = NULL;
+
+    for_each(mItemInfos.begin(), mItemInfos.end(), make_dtor(mItemInfos));
+    mItemInfos.clear();
+    mLoaded = false;
+}
+
+const ItemInfo& ItemDB::get(int id)
+{
+    assert(mLoaded);
+
+    ItemInfoIterator i = mItemInfos.find(id);
+
+    if (i == mItemInfos.end())
+    {
+        logger->log("ItemDB: Error, unknown item ID# %d", id);
+        return *mUnknown;
+    }
+    else
+    {
+        return *(i->second);
+    }
+}
+
+void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
+{
+    std::string gender = XML::getProperty(node, "gender", "unisex");
+    std::string filename = (const char*) node->xmlChildrenNode->content;
+
+    if (gender == "male" || gender == "unisex")
+    {
+        itemInfo->setSprite(filename, 0);
+    }
+
+    if (gender == "female" || gender == "unisex")
+    {
+        itemInfo->setSprite(filename, 1);
+    }
+}
+
+void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node)
+{
+    std::string event = XML::getProperty(node, "event", "");
+    std::string filename = (const char*) node->xmlChildrenNode->content;
+
+    if (event == "hit")
+    {
+        itemInfo->addSound(EQUIP_EVENT_HIT, filename);
+    }
+    else if (event == "strike")
+    {
+        itemInfo->addSound(EQUIP_EVENT_STRIKE, filename);
+    }
+    else
+    {
+        logger->log("ItemDB: Ignoring unknown sound event '%s'",
+                event.c_str());
+    }
+}