Equipment database namespace and support for gender specific equipment sprites

5 files changed, 264 insertions, 56 deletions

diff --git a/src/resources/equipmentdb.cpp b/src/resources/equipmentdb.cpp
new file mode 100644
index 00000000..8bbfc177
--- /dev/null
+++ b/src/resources/equipmentdb.cpp
@@ -0,0 +1,157 @@
+/*

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

+{

+    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 (   xmlNodePtr equipmentNode = rootNode->xmlChildrenNode;

+            equipmentNode != NULL;

+            equipmentNode = equipmentNode->next)

+    {

+

+        if (!xmlStrEqual(equipmentNode->name, BAD_CAST "equipment"))

+        {

+            continue;

+        }

+

+        EquipmentInfo *currentInfo = new EquipmentInfo();

+

+        currentInfo->setSlot (XML::getProperty(equipmentNode, "slot", 0));

+

+        //iterate <sprite>s

+        for (   xmlNodePtr spriteNode = equipmentNode->xmlChildrenNode;

+                spriteNode != NULL;

+                spriteNode = spriteNode->next)

+        {

+            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/equipmentdb.h b/src/resources/equipmentdb.h
new file mode 100644
index 00000000..b8618f5f
--- /dev/null
+++ b/src/resources/equipmentdb.h
@@ -0,0 +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_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.h b/src/resources/equipmentinfo.h
new file mode 100644
index 00000000..bc3bdd8d
--- /dev/null
+++ b/src/resources/equipmentinfo.h
@@ -0,0 +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; };

+

+        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 2f791f07..d57a3780 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.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: itemmanager.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $

+ *  $Id:

  */

 

 #include "itemdb.h"

@@ -38,9 +38,9 @@
             target = cast((const char*)prop); \

             xmlFree(prop); \

         }

-namespace ItemDB

+namespace

 {

-    ItemInfos mItemInfos;

+    ItemDB::ItemInfos mItemInfos;

     ItemInfo mUnknown;

 }

 

diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 2821a2cf..5922984a 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -51,56 +51,3 @@ namespace ItemDB
 }

 

 #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: 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>

-

-/**

- * The namespace that holds the item information

- */

-namespace ItemDB

-{

-    /**

-     * Loads the item data from Items.xml

-     */

-    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