add basic client side only support for pets.

now pets cant move and dont have any ai.
pet can be only spawn at player position if equiped item with assigned pet.

5 files changed, 199 insertions, 1 deletions

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index befcd621e..973e5c71d 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -210,6 +210,7 @@ void ItemDB::load()
         std::string attackAction = XML::getProperty(node, "attack-action", "");
         std::string drawBefore = XML::getProperty(node, "drawBefore", "");
         std::string drawAfter = XML::getProperty(node, "drawAfter", "");
+        const int pet = XML::getProperty(node, "pet", 0);
         const int maxFloorOffset = XML::getIntProperty(
             node, "maxFloorOffset", 32, 0, 32);
         std::string colors;
@@ -261,6 +262,7 @@ void ItemDB::load()
         itemInfo->setDescription(description);
         itemInfo->setType(itemTypeFromString(typeStr));
         itemInfo->addTag(mTags["All"]);
+        itemInfo->setPet(pet);
         switch (itemInfo->getType())
         {
             case ITEM_USABLE:
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 325528d60..92df520ea 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -54,7 +54,8 @@ ItemInfo::ItemInfo() :
     mCriticalHitEffectId(-1),
     mMissEffectId(-1),
     maxFloorOffset(32),
-    mPickupCursor(Cursor::CURSOR_POINTER)
+    mPickupCursor(Cursor::CURSOR_POINTER),
+    mPet(0)
 {
     for (int f = 0; f < 10; f ++)
     {
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 0a3b20c61..afea431ee 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -256,6 +256,12 @@ class ItemInfo final
 
         bool isRemoveItemId(int id) const A_WARN_UNUSED;
 
+        void setPet(const int pet)
+        { mPet = pet; }
+
+        int getPet() const
+        { return mPet; }
+
         /** Effects to be shown when weapon attacks - see also effects.xml */
         std::string mMissileParticleFile;
 
@@ -331,6 +337,7 @@ class ItemInfo final
         int mMissEffectId;
         int maxFloorOffset;
         Cursor::Cursor mPickupCursor;
+        int mPet;
 };
 
 #endif
diff --git a/src/resources/petdb.cpp b/src/resources/petdb.cpp
new file mode 100644
index 000000000..1ca67db8d
--- /dev/null
+++ b/src/resources/petdb.cpp
@@ -0,0 +1,147 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/petdb.h"
+
+#include "logger.h"
+
+#include "resources/beinginfo.h"
+
+#include "utils/dtor.h"
+#include "configuration.h"
+
+#include "debug.h"
+
+namespace
+{
+    BeingInfos mPETInfos;
+    bool mLoaded = false;
+}
+
+extern int serverVersion;
+
+void PETDB::load()
+{
+    if (mLoaded)
+        unload();
+
+    logger->log1("Initializing PET database...");
+
+    XML::Document doc("pets.xml");
+    const XmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlNameEqual(rootNode, "pets"))
+    {
+        logger->log("PET Database: Error while loading pets.xml!");
+        mLoaded = true;
+        return;
+    }
+
+    // iterate <pet>s
+    for_each_xml_child_node(petNode, rootNode)
+    {
+        if (!xmlNameEqual(petNode, "pet"))
+            continue;
+
+        const int id = XML::getProperty(petNode, "id", 0);
+        if (id == 0)
+        {
+            logger->log1("PET Database: PET with missing ID in pets.xml!");
+            continue;
+        }
+
+        BeingInfo *const currentInfo = new BeingInfo;
+
+        currentInfo->setTargetSelection(XML::getBoolProperty(petNode,
+            "targetSelection", false));
+
+        currentInfo->setTargetCursorSize(XML::getProperty(petNode,
+            "targetCursor", "medium"));
+
+        currentInfo->setHoverCursor(XML::getProperty(petNode,
+            "hoverCursor", "talk"));
+
+        currentInfo->setTargetOffsetX(XML::getProperty(petNode,
+            "targetOffsetX", 0));
+
+        currentInfo->setTargetOffsetY(XML::getProperty(petNode,
+            "targetOffsetY", 0));
+
+        currentInfo->setSortOffsetY(XML::getProperty(petNode,
+            "sortOffsetY", 0));
+
+        currentInfo->setDeadSortOffsetY(XML::getProperty(petNode,
+            "deadSortOffsetY", 31));
+
+        SpriteDisplay display;
+        for_each_xml_child_node(spriteNode, petNode)
+        {
+            if (!spriteNode->xmlChildrenNode)
+                continue;
+
+            if (xmlNameEqual(spriteNode, "sprite"))
+            {
+                SpriteReference *const currentSprite = new SpriteReference;
+                currentSprite->sprite = reinterpret_cast<const char*>(
+                    spriteNode->xmlChildrenNode->content);
+                currentSprite->variant =
+                    XML::getProperty(spriteNode, "variant", 0);
+                display.sprites.push_back(currentSprite);
+            }
+            else if (xmlNameEqual(spriteNode, "particlefx"))
+            {
+                std::string particlefx = reinterpret_cast<const char*>(
+                    spriteNode->xmlChildrenNode->content);
+                display.particles.push_back(particlefx);
+            }
+        }
+
+        currentInfo->setDisplay(display);
+
+        mPETInfos[id] = currentInfo;
+    }
+
+    mLoaded = true;
+}
+
+void PETDB::unload()
+{
+    delete_all(mPETInfos);
+    mPETInfos.clear();
+
+    mLoaded = false;
+}
+
+BeingInfo *PETDB::get(const int id)
+{
+    const BeingInfoIterator i = mPETInfos.find(id);
+
+    if (i == mPETInfos.end())
+    {
+        logger->log("PETDB: Warning, unknown PET ID %d requested", id);
+        return BeingInfo::unknown;
+    }
+    else
+    {
+        return i->second;
+    }
+}
diff --git a/src/resources/petdb.h b/src/resources/petdb.h
new file mode 100644
index 000000000..755937902
--- /dev/null
+++ b/src/resources/petdb.h
@@ -0,0 +1,41 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PET_DB_H
+#define PET_DB_H
+
+#include <stdint.h>
+
+#include "localconsts.h"
+
+class BeingInfo;
+
+namespace PETDB
+{
+    void load();
+
+    void unload();
+
+    BeingInfo *get(const int id) A_WARN_UNUSED;
+}
+
+#endif