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.

9 files changed, 376 insertions, 597 deletions

diff --git a/src/resources/equipmentdb.cpp b/src/resources/equipmentdb.cpp
deleted file mode 100644
index 55107050..00000000
--- a/src/resources/equipmentdb.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 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 "equipmentdb.h"
-
-#include "resourcemanager.h"
-
-#include "../log.h"
-
-#include "../utils/dtor.h"
-#include "../utils/xml.h"
-
-namespace
-{
-    EquipmentDB::EquipmentInfos mEquipmentInfos;
-    EquipmentInfo mUnknown;
-    bool mLoaded = false;
-}
-
-void
-EquipmentDB::load()
-{
-    if (mLoaded)
-        return;
-
-    logger->log("Initializing equipment database...");
-    mUnknown.setSprite("error.xml", 0);
-    mUnknown.setSprite("error.xml", 1);
-
-    ResourceManager *resman = ResourceManager::getInstance();
-    int size;
-    char *data = (char*)resman->loadFile("equipment.xml", size);
-
-    if (!data)
-    {
-        logger->error("Equipment Database: Could not find equipment.xml!");
-    }
-
-    xmlDocPtr doc = xmlParseMemory(data, size);
-    free(data);
-
-    if (!doc)
-    {
-        logger->error("Equipment Database: Error while parsing equipment database (equipment.xml)!");
-    }
-
-    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
-    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "equipments"))
-    {
-        logger->error("Equipment Database: equipment.xml is not a valid database file!");
-    }
-
-    //iterate <equipment>s
-    for_each_xml_child_node(equipmentNode, rootNode)
-    {
-        if (!xmlStrEqual(equipmentNode->name, BAD_CAST "equipment"))
-        {
-            continue;
-        }
-
-        EquipmentInfo *currentInfo = new EquipmentInfo();
-
-        currentInfo->setSlot (XML::getProperty(equipmentNode, "slot", 0));
-        currentInfo->setAttackType (XML::getProperty(equipmentNode, "attacktype", ""));
-
-        //iterate <sprite>s and <sound>s
-        for_each_xml_child_node(spriteNode, equipmentNode)
-        {
-            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
-            {
-                std::string gender = XML::getProperty(spriteNode, "gender", "unisex");
-                std::string filename = (const char*) spriteNode->xmlChildrenNode->content;
-
-                if (gender == "male" || gender == "unisex")
-                {
-                    currentInfo->setSprite(filename, 0);
-                }
-
-                if (gender == "female" || gender == "unisex")
-                {
-                    currentInfo->setSprite(filename, 1);
-                }
-            }
-
-            if (xmlStrEqual(spriteNode->name, BAD_CAST "sound"))
-            {
-                std::string event = XML::getProperty(spriteNode, "event", "");
-                const char *filename;
-                filename = (const char*) spriteNode->xmlChildrenNode->content;
-
-                if (event == "hit")
-                {
-                    currentInfo->addSound(EQUIP_EVENT_HIT, filename);
-                }
-                else if (event == "strike")
-                {
-                    currentInfo->addSound(EQUIP_EVENT_STRIKE, filename);
-                }
-                else
-                {
-                    logger->log("EquipmentDB: Warning, sound effect %s for unknown event %s",
-                                filename, event.c_str());
-                }
-            }
-        }
-
-        setEquipment(   XML::getProperty(equipmentNode, "id", 0),
-                        currentInfo);
-    }
-
-    mLoaded = true;
-}
-
-void
-EquipmentDB::unload()
-{
-    // kill EquipmentInfos
-    for_each(mEquipmentInfos.begin(), mEquipmentInfos.end(),
-             make_dtor(mEquipmentInfos));
-    mEquipmentInfos.clear();
-
-    mLoaded = false;
-}
-
-EquipmentInfo*
-EquipmentDB::get(int id)
-{
-    if (!mLoaded) {
-        logger->error("Error: Equipment database used before initialization!");
-    }
-
-    EquipmentInfoIterator i = mEquipmentInfos.find(id);
-
-    assert(i != mEquipmentInfos.end());
-
-    if (i == mEquipmentInfos.end())
-    {
-        logger->log("EquipmentDB: Error, unknown equipment ID# %d", id);
-        return &mUnknown;
-    }
-    else
-    {
-        return i->second;
-    }
-}
-
-void
-EquipmentDB::setEquipment(int id, EquipmentInfo* equipmentInfo)
-{
-    if (mEquipmentInfos.find(id) != mEquipmentInfos.end()) {
-        logger->log("Warning: Equipment Piece with ID %d defined multiple times",
-                    id);
-        delete equipmentInfo;
-    }
-    else {
-        mEquipmentInfos[id] = equipmentInfo;
-    };
-}
diff --git a/src/resources/equipmentdb.h b/src/resources/equipmentdb.h
deleted file mode 100644
index 76866961..00000000
--- a/src/resources/equipmentdb.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 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$
- */
-
-#ifndef _TMW_EQUIPMENT_DB_H
-#define _TMW_EQUIPMENT_DB_H
-
-#include <map>
-
-#include "equipmentinfo.h"
-
-namespace EquipmentDB
-{
-    /**
-     * Loads the equipment info from Items.xml
-     */
-    void load();
-
-    /**
-     * Frees equipment data
-     */
-    void unload();
-
-    void setEquipment(int id, EquipmentInfo* equipmentInfo);
-
-    EquipmentInfo* get(int id);
-
-    // Equipment database types
-    typedef std::map<int, EquipmentInfo*> EquipmentInfos;
-    typedef EquipmentInfos::iterator EquipmentInfoIterator;
-}
-
-#endif
diff --git a/src/resources/equipmentinfo.cpp b/src/resources/equipmentinfo.cpp
deleted file mode 100644
index 9e1a03b9..00000000
--- a/src/resources/equipmentinfo.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 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 "equipmentinfo.h"
-
-void
-EquipmentInfo::setAttackType(std::string attackType)
-{
-    if (attackType == "swing")
-    {
-        mAttackType = ACTION_ATTACK_SWING;
-    }
-    else if (attackType == "stab")
-    {
-        mAttackType = ACTION_ATTACK_STAB;
-    }
-    else if (attackType == "bow")
-    {
-        mAttackType = ACTION_ATTACK_BOW;
-    }
-    else if (attackType == "throw")
-    {
-        mAttackType = ACTION_ATTACK_THROW;
-    }
-    else if (attackType == "none")
-    {
-        mAttackType = ACTION_DEFAULT;
-    }
-    else
-    {
-        mAttackType = ACTION_ATTACK;
-    }
-}
-
-void
-EquipmentInfo::addSound (EquipmentSoundEvent event, std::string filename)
-{
-    if (mSounds.find(event) == mSounds.end())
-    {
-        mSounds[event] = new std::vector<std::string>;
-    }
-
-    mSounds[event]->push_back("sfx/" + filename);
-}
-
-
-std::string
-EquipmentInfo::getSound (EquipmentSoundEvent event) const
-{
-    std::map<EquipmentSoundEvent, std::vector<std::string>* >::const_iterator i;
-
-    i = mSounds.find(event);
-
-    if (i == mSounds.end())
-    {
-        return "";
-    }
-    else
-    {
-        return i->second->at(rand()%i->second->size());
-    }
-}
diff --git a/src/resources/equipmentinfo.h b/src/resources/equipmentinfo.h
deleted file mode 100644
index d9439c50..00000000
--- a/src/resources/equipmentinfo.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 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$
- */
-
-#ifndef _TMW_EQUIPMENTINFO_H_
-#define _TMW_EQUIPMENTINFO_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "spritedef.h"
-
-enum EquipmentSoundEvent
-{
-    EQUIP_EVENT_STRIKE,
-    EQUIP_EVENT_HIT
-};
-
-class EquipmentInfo
-{
-    public:
-        EquipmentInfo():
-            mSlot (0),
-            mAttackType(ACTION_DEFAULT)
-        {
-        }
-
-        void
-        setSlot (int slot) { mSlot = slot; }
-
-        const std::string&
-        getSprite(int gender) { return animationFiles[gender]; }
-
-        void
-        setSprite(const std::string &animationFile, int gender)
-        { animationFiles[gender] = animationFile; }
-
-        void
-        setAttackType(std::string attackType);
-
-        const SpriteAction
-        getAttackType() { return mAttackType; }
-
-        void
-        addSound(EquipmentSoundEvent event, std::string filename);
-
-        std::string
-        getSound(EquipmentSoundEvent event) const;
-
-    private:
-        int mSlot;   //not used at the moment but maybe useful on our own server
-        SpriteAction mAttackType;
-        std::map<int, std::string> animationFiles;
-        std::map<EquipmentSoundEvent, std::vector<std::string>* > mSounds;
-};
-
-#endif
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());
+    }
+}
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index b09d1cc0..c2be5396 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -24,11 +24,11 @@
 
 #include "resourcemanager.h"
 #include "image.h"
-
+#include "itemdb.h"
 
 ItemInfo::~ItemInfo()
 {
-    if (mImage != NULL)
+    if (mImage)
     {
         mImage->decRef();
     }
@@ -37,19 +37,87 @@ ItemInfo::~ItemInfo()
 void
 ItemInfo::setImage(const std::string &image)
 {
+    if (mImage)
+    {
+        mImage->decRef();
+    }
+
+    ResourceManager *resman = ResourceManager::getInstance();
     mImageName = "graphics/items/" + image;
+    mImage = ResourceManager::getInstance()->getImage(mImageName);
 
-    if (mImageName != "")
+    if (!mImage)
     {
-        if (mImage != NULL)
-        {
-            mImage->decRef();
-        }
+        mImage = resman->getImage("graphics/gui/unknown-item.png");
+    }
+}
 
-        mImage = ResourceManager::getInstance()->getImage(mImageName);
+const std::string&
+ItemInfo::getSprite(int gender) const
+{
+    if (mView)
+    {
+        // Forward the request to the item defining how to view this item
+        return ItemDB::get(mView).getSprite(gender);
     }
     else
     {
-        mImage = NULL;
+        static const std::string empty = "";
+        std::map<int, std::string>::const_iterator i =
+            mAnimationFiles.find(gender);
+
+        return (i != mAnimationFiles.end()) ? i->second : empty;
+    }
+}
+
+void
+ItemInfo::setAttackType(const std::string &attackType)
+{
+    if (attackType == "swing")
+    {
+        mAttackType = ACTION_ATTACK_SWING;
+    }
+    else if (attackType == "stab")
+    {
+        mAttackType = ACTION_ATTACK_STAB;
+    }
+    else if (attackType == "bow")
+    {
+        mAttackType = ACTION_ATTACK_BOW;
     }
+    else if (attackType == "throw")
+    {
+        mAttackType = ACTION_ATTACK_THROW;
+    }
+    else if (attackType == "none")
+    {
+        mAttackType = ACTION_DEFAULT;
+    }
+    else
+    {
+        mAttackType = ACTION_ATTACK;
+    }
+}
+
+void
+ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename)
+{
+    if (mSounds.find(event) == mSounds.end())
+    {
+        mSounds[event] = new std::vector<std::string>;
+    }
+
+    mSounds[event]->push_back("sfx/" + filename);
+}
+
+
+const std::string&
+ItemInfo::getSound(EquipmentSoundEvent event) const
+{
+    static const std::string empty = "";
+    std::map<EquipmentSoundEvent, std::vector<std::string>*>::const_iterator i;
+    i = mSounds.find(event);
+
+    return (i == mSounds.end()) ? empty :
+        i->second->at(rand() % i->second->size());
 }
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index e4f851bb..4fd1638e 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -24,12 +24,23 @@
 #ifndef _TMW_ITEMINFO_H_
 #define _TMW_ITEMINFO_H_
 
+#include <map>
 #include <string>
+#include <vector>
+
+#include "spritedef.h"
 
 class Image;
 
+enum EquipmentSoundEvent
+{
+    EQUIP_EVENT_STRIKE,
+    EQUIP_EVENT_HIT
+};
+
 /**
- * Defines a class for storing item infos.
+ * Defines a class for storing item infos. This includes information used when
+ * the item is equipped.
  */
 class ItemInfo
 {
@@ -40,10 +51,11 @@ class ItemInfo
         ItemInfo():
             mImageName(""),
             mImage(NULL),
-            mArt(0),
             mType(0),
             mWeight(0),
-            mSlot(0)
+            mView(0),
+            mSlot(0),
+            mAttackType(ACTION_DEFAULT)
         {
         }
 
@@ -52,73 +64,89 @@ class ItemInfo
          */
         ~ItemInfo();
 
-        void
-        setArt(short art) { mArt = art; }
+        void setName(const std::string &name)
+        { mName = name; }
 
-        short
-        getArt() const { return mArt; }
+        const std::string& getName() const
+        { return mName; }
 
-        void
-        setName(const std::string &name) { mName = name; }
+        void setImage(const std::string &image);
 
-        const std::string&
-        getName() const { return mName; }
+        Image* getImage() const
+        { return mImage; }
 
-        void
-        setImage(const std::string &image);
+        void setDescription(const std::string &description)
+        { mDescription = description; }
 
-        Image*
-        getImage() const { return mImage; }
+        const std::string& getDescription() const
+        { return mDescription; }
 
-        void
-        setDescription(const std::string &description)
-        {
-            mDescription = description;
-        }
+        void setEffect(const std::string &effect)
+        { mEffect = effect; }
 
         const std::string&
-        getDescription() const { return mDescription; }
+        getEffect() const { return mEffect; }
 
-        void
-        setEffect(const std::string &effect) { mEffect = effect; }
+        void setType(short type)
+        { mType = type; }
 
-        const std::string&
-        getEffect() const { return mEffect; }
+        short getType() const
+        { return mType; }
+
+        void setWeight(short weight)
+        { mWeight = weight; }
+
+        short getWeight() const
+        { return mWeight; }
+
+        void setView(int view)
+        { mView = view; }
+
+        void setSlot(char slot)
+        { mSlot = slot; }
 
-        void
-        setType(short type) { mType = type; }
+        char getSlot() const
+        { return mSlot; }
 
-        short
-        getType() const { return mType; }
+        void setSprite(const std::string &animationFile, int gender)
+        { mAnimationFiles[gender] = animationFile; }
 
-        void
-        setWeight(short weight) { mWeight = weight; }
+        const std::string& getSprite(int gender) const;
 
-        short
-        getWeight() const { return mWeight; }
+        void setAttackType(const std::string &attackType);
 
-        void
-        setSlot(char slot) { mSlot = slot; }
+        const SpriteAction getAttackType() const
+        { return mAttackType; }
 
-        char
-        getSlot() const { return mSlot; }
+        void addSound(EquipmentSoundEvent event, const std::string &filename);
+
+        const std::string& getSound(EquipmentSoundEvent event) const;
 
     protected:
-        std::string mImageName;
+        std::string mImageName;        /**< The filename of the icon image. */
 
         /* TODO (BL): I do not think the item info should keep a reference to
          * the item icon. It would probably be better if this was kept in the
          * Item class, so that the images can be lazily instantiated and also
          * unloaded when no longer used.
          */
-        Image *mImage;
-        short mArt;
+        Image *mImage;                 /**< The loaded icon image. */
         std::string mName;
-        std::string mDescription;
-        std::string mEffect;
-        short mType;
-        short mWeight;
-        char mSlot;
+        std::string mDescription;      /**< Short description. */
+        std::string mEffect;           /**< Description of effects. */
+        short mType;                   /**< Item type (never used). */
+        short mWeight;                 /**< Weight in grams. */
+        int mView;                     /**< Item ID of how this item looks. */
+
+        // Equipment related members
+        char mSlot;                    /**< Equipment slot. */
+        SpriteAction mAttackType;      /**< Attack type, in case of weapon. */
+
+        /** Maps gender to sprite filenames. */
+        std::map<int, std::string> mAnimationFiles;
+
+        /** Stores the names of sounds to be played at certain event. */
+        std::map<EquipmentSoundEvent, std::vector<std::string>* > mSounds;
 };
 
 #endif
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 260d5aa9..940ded36 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -156,7 +156,7 @@ MapReader::readMap(const std::string &filename)
 
     if (buffer == NULL)
     {
-        logger->log("Map file not found (%s)\n", filename.c_str());
+        logger->log("Map file not found (%s)", filename.c_str());
         return NULL;
     }
 
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 6d335b02..55d7f459 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -24,11 +24,11 @@
 #ifndef _TMW_SPRITEDEF_H
 #define _TMW_SPRITEDEF_H
 
-#include "resource.h"
-
 #include <map>
 #include <string>
 
+#include "resource.h"
+
 #include <libxml/tree.h>
 
 class Action;