Fixed svn properties.

9 files changed, 658 insertions, 658 deletions

diff --git a/src/resources/equipmentdb.cpp b/src/resources/equipmentdb.cpp
index 64982ce3..38ac6415 100644
--- a/src/resources/equipmentdb.cpp
+++ b/src/resources/equipmentdb.cpp
@@ -1,156 +1,156 @@
-/*

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

-

-        //iterate <sprite>s

-        for_each_xml_child_node(spriteNode, equipmentNode)

-        {

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

-            {

-                continue;

-            }

-

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

-            }

-        }

-

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

-

-    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;

-    };

-}

+/*
+ *  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 "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));
+
+        //iterate <sprite>s
+        for_each_xml_child_node(spriteNode, equipmentNode)
+        {
+            if (!xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+            {
+                continue;
+            }
+
+            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);
+            }
+        }
+
+        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);
+
+    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/equipmentinfo.h b/src/resources/equipmentinfo.h
index 93a1cb42..75ed1b8a 100644
--- a/src/resources/equipmentinfo.h
+++ b/src/resources/equipmentinfo.h
@@ -1,52 +1,52 @@
-/*

- *  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 <string>

-#include <map>

-

-class EquipmentInfo

-{

-    public:

-        EquipmentInfo():

-            mSlot (0)

-        {

-        };

-

-        void

-        setSlot (int slot) { mSlot = slot; };

-

-        const std::string&

-        getSprite(int gender) {return animationFiles[gender]; };

-

-        void

-        setSprite(std::string animationFile, int gender) {animationFiles[gender] = animationFile; };

-

-    private:

-        int mSlot;   //not used at the moment but maybe useful on our own server

-        std::map<int, std::string> animationFiles;

-};

-

-#endif

+/*
+ *  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 <string>
+#include <map>
+
+class EquipmentInfo
+{
+    public:
+        EquipmentInfo():
+            mSlot (0)
+        {
+        };
+
+        void
+        setSlot (int slot) { mSlot = slot; };
+
+        const std::string&
+        getSprite(int gender) {return animationFiles[gender]; };
+
+        void
+        setSprite(std::string animationFile, int gender) {animationFiles[gender] = animationFile; };
+
+    private:
+        int mSlot;   //not used at the moment but maybe useful on our own server
+        std::map<int, std::string> animationFiles;
+};
+
+#endif
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 70ead6ab..7b16339c 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -1,149 +1,149 @@
-/*

- *  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 "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;
+}
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 6ead5b22..df7e7be9 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -1,53 +1,53 @@
-/*

- *  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: itemdb.h 2650 2006-09-03 15:00:47Z b_lindeijer $

- */

-

-#ifndef _TMW_ITEM_MANAGER_H

-#define _TMW_ITEM_MANAGER_H

-

-#include "iteminfo.h"

-

-#include <map>

-

-/**

- * Item information database.

- */

-namespace ItemDB

-{

-    /**

-     * Loads the item data from <code>items.xml</code>.

-     */

-    void load();

-

-    /**

-     * Frees item data.

-     */

-    void unload();

-

-    const ItemInfo& get(int id);

-

-    // Items database

-    typedef std::map<int, ItemInfo*> ItemInfos;

-    typedef ItemInfos::iterator ItemInfoIterator;

-}

-

-#endif

+/*
+ *  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$
+ */
+
+#ifndef _TMW_ITEM_MANAGER_H
+#define _TMW_ITEM_MANAGER_H
+
+#include "iteminfo.h"
+
+#include <map>
+
+/**
+ * Item information database.
+ */
+namespace ItemDB
+{
+    /**
+     * Loads the item data from <code>items.xml</code>.
+     */
+    void load();
+
+    /**
+     * Frees item data.
+     */
+    void unload();
+
+    const ItemInfo& get(int id);
+
+    // Items database
+    typedef std::map<int, ItemInfo*> ItemInfos;
+    typedef ItemInfos::iterator ItemInfoIterator;
+}
+
+#endif
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 89afc549..339ed6ba 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -1,175 +1,175 @@
-/*

- *  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 "monsterdb.h"

-

-#include "resourcemanager.h"

-

-#include "../log.h"

-

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

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

-

-namespace

-{

-    MonsterDB::MonsterInfos mMonsterInfos;

-    MonsterInfo mUnknown;

-    bool mLoaded = false;

-}

-

-void

-MonsterDB::load()

-{

-    if (mLoaded)

-        return;

-

-    mUnknown.setSprite("error.xml");

-    mUnknown.setName("unnamed");

-

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

-

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

-    int size;

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

-

-    if (!data)

-    {

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

-    }

-

-    xmlDocPtr doc = xmlParseMemory(data, size);

-    free(data);

-

-    if (!doc)

-    {

-        logger->error("Monster Database: Error while parsing monster database (monsters.xml)!");

-    }

-

-    xmlNodePtr rootNode = xmlDocGetRootElement(doc);

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

-    {

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

-    }

-

-    //iterate <monster>s

-    for_each_xml_child_node(monsterNode, rootNode)

-    {

-        if (!xmlStrEqual(monsterNode->name, BAD_CAST "monster"))

-        {

-            continue;

-        }

-

-        MonsterInfo *currentInfo = new MonsterInfo();

-

-        currentInfo->setName (XML::getProperty(monsterNode, "name", "unnamed"));

-

-        std::string targetCursor;

-        targetCursor = XML::getProperty(monsterNode, "targetCursor", "medium");

-        if (targetCursor == "small")

-        {

-            currentInfo->setTargetCursorSize(Being::TC_SMALL);

-        }

-        else if (targetCursor == "medium")

-        {

-            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);

-        }

-        else if (targetCursor == "large")

-        {

-            currentInfo->setTargetCursorSize(Being::TC_LARGE);

-        }

-        else

-        {

-            logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one",

-                        targetCursor.c_str(), currentInfo->getName().c_str());

-            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);

-        }

-

-        //iterate <sprite>s and <sound>s

-        for_each_xml_child_node(spriteNode, monsterNode)

-        {

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

-            {

-                currentInfo->setSprite((const char*) spriteNode->xmlChildrenNode->content);

-            }

-

-            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(EVENT_HIT, filename);

-                }

-                else if (event == "miss")

-                {

-                    currentInfo->addSound(EVENT_MISS, filename);

-                }

-                else if (event == "hurt")

-                {

-                    currentInfo->addSound(EVENT_HURT, filename);

-                }

-                else if (event == "die")

-                {

-                    currentInfo->addSound(EVENT_DIE, filename);

-                }

-                else

-                {

-                    logger->log("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s",

-                                filename, event.c_str(), currentInfo->getName().c_str());

-                }

-            }

-        }

-        mMonsterInfos[XML::getProperty(monsterNode, "id", 0)] = currentInfo;

-    }

-

-    mLoaded = true;

-}

-

-void

-MonsterDB::unload()

-{

-    for_each (  mMonsterInfos.begin(), mMonsterInfos.end(),

-                make_dtor(mMonsterInfos));

-    mMonsterInfos.clear();

-

-    mLoaded = false;

-}

-

-

-const MonsterInfo&

-MonsterDB::get (int id)

-{

-    MonsterInfoIterator i = mMonsterInfos.find(id);

-

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

-    {

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

-        return mUnknown;

-    }

-    else

-    {

-        return *(i->second);

-    }

-}

+/*
+ *  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 "monsterdb.h"
+
+#include "resourcemanager.h"
+
+#include "../log.h"
+
+#include "../utils/dtor.h"
+#include "../utils/xml.h"
+
+namespace
+{
+    MonsterDB::MonsterInfos mMonsterInfos;
+    MonsterInfo mUnknown;
+    bool mLoaded = false;
+}
+
+void
+MonsterDB::load()
+{
+    if (mLoaded)
+        return;
+
+    mUnknown.setSprite("error.xml");
+    mUnknown.setName("unnamed");
+
+    logger->log("Initializing monster database...");
+
+    ResourceManager *resman = ResourceManager::getInstance();
+    int size;
+    char *data = (char*)resman->loadFile("monsters.xml", size);
+
+    if (!data)
+    {
+        logger->error("Monster Database: Could not find monsters.xml!");
+    }
+
+    xmlDocPtr doc = xmlParseMemory(data, size);
+    free(data);
+
+    if (!doc)
+    {
+        logger->error("Monster Database: Error while parsing monster database (monsters.xml)!");
+    }
+
+    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters"))
+    {
+        logger->error("Monster Database: monster.xml is not a valid database file!");
+    }
+
+    //iterate <monster>s
+    for_each_xml_child_node(monsterNode, rootNode)
+    {
+        if (!xmlStrEqual(monsterNode->name, BAD_CAST "monster"))
+        {
+            continue;
+        }
+
+        MonsterInfo *currentInfo = new MonsterInfo();
+
+        currentInfo->setName (XML::getProperty(monsterNode, "name", "unnamed"));
+
+        std::string targetCursor;
+        targetCursor = XML::getProperty(monsterNode, "targetCursor", "medium");
+        if (targetCursor == "small")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_SMALL);
+        }
+        else if (targetCursor == "medium")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
+        }
+        else if (targetCursor == "large")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_LARGE);
+        }
+        else
+        {
+            logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one",
+                        targetCursor.c_str(), currentInfo->getName().c_str());
+            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
+        }
+
+        //iterate <sprite>s and <sound>s
+        for_each_xml_child_node(spriteNode, monsterNode)
+        {
+            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+            {
+                currentInfo->setSprite((const char*) spriteNode->xmlChildrenNode->content);
+            }
+
+            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(EVENT_HIT, filename);
+                }
+                else if (event == "miss")
+                {
+                    currentInfo->addSound(EVENT_MISS, filename);
+                }
+                else if (event == "hurt")
+                {
+                    currentInfo->addSound(EVENT_HURT, filename);
+                }
+                else if (event == "die")
+                {
+                    currentInfo->addSound(EVENT_DIE, filename);
+                }
+                else
+                {
+                    logger->log("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s",
+                                filename, event.c_str(), currentInfo->getName().c_str());
+                }
+            }
+        }
+        mMonsterInfos[XML::getProperty(monsterNode, "id", 0)] = currentInfo;
+    }
+
+    mLoaded = true;
+}
+
+void
+MonsterDB::unload()
+{
+    for_each (  mMonsterInfos.begin(), mMonsterInfos.end(),
+                make_dtor(mMonsterInfos));
+    mMonsterInfos.clear();
+
+    mLoaded = false;
+}
+
+
+const MonsterInfo&
+MonsterDB::get (int id)
+{
+    MonsterInfoIterator i = mMonsterInfos.find(id);
+
+    if (i == mMonsterInfos.end())
+    {
+        logger->log("MonsterDB: Warning, unknown monster ID %d requested", id);
+        return mUnknown;
+    }
+    else
+    {
+        return *(i->second);
+    }
+}
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 43aac32a..2a59419e 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -1,70 +1,70 @@
-/*

- *  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: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $

- */

-

-#include "monsterinfo.h"

-

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

-

-MonsterInfo::MonsterInfo():

-    mSprite("error.xml")

-{

-

-}

-

-MonsterInfo::~MonsterInfo()

-{

-    //kill vectors in mSoundEffects

-    for_each (  mSounds.begin(), mSounds.end(),

-                make_dtor(mSounds));

-    mSounds.clear();

-}

-

-

-void

-MonsterInfo::addSound (SoundEvent 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

-MonsterInfo::getSound (SoundEvent event) const

-{

-    std::map<SoundEvent, 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());

-    }

-}

+/*
+ *  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 "monsterinfo.h"
+
+#include "../utils/dtor.h"
+
+MonsterInfo::MonsterInfo():
+    mSprite("error.xml")
+{
+
+}
+
+MonsterInfo::~MonsterInfo()
+{
+    //kill vectors in mSoundEffects
+    for_each (  mSounds.begin(), mSounds.end(),
+                make_dtor(mSounds));
+    mSounds.clear();
+}
+
+
+void
+MonsterInfo::addSound (SoundEvent 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
+MonsterInfo::getSound (SoundEvent event) const
+{
+    std::map<SoundEvent, 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/monsterinfo.h b/src/resources/monsterinfo.h
index d2a0a2c8..aa7db9f0 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -18,7 +18,7 @@
  *  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: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_MONSTERINFO_H_
diff --git a/src/resources/openglsdlimageloader.cpp b/src/resources/openglsdlimageloader.cpp
index 68de1e19..9b6645bd 100644
--- a/src/resources/openglsdlimageloader.cpp
+++ b/src/resources/openglsdlimageloader.cpp
@@ -18,7 +18,7 @@
  *  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: sdlimageloader.cpp 2121 2006-01-31 02:55:26Z der_doener $
+ *  $Id$
  */
 
 #include "openglsdlimageloader.h"
diff --git a/src/resources/openglsdlimageloader.h b/src/resources/openglsdlimageloader.h
index b79dde15..d776dafe 100644
--- a/src/resources/openglsdlimageloader.h
+++ b/src/resources/openglsdlimageloader.h
@@ -18,7 +18,7 @@
  *  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: sdlimageloader.h 1724 2005-09-12 22:15:35Z der_doener $
+ *  $Id$
  */
 
 #ifndef _TMW_OPENGLSDLIMAGELOADER_H