Allow load avatars from avatars.xml

8 files changed, 173 insertions, 2 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb55c84eb..faf54448f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -424,6 +424,8 @@ SET(SRCS
     resources/animation.h
     resources/atlasmanager.cpp
     resources/atlasmanager.h
+    resources/avatardb.cpp
+    resources/avatardb.h
     resources/beinginfo.cpp
     resources/beinginfo.h
     resources/chardb.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cd51ba5f..773d86761 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -425,6 +425,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/animation.h \
 	      resources/atlasmanager.cpp \
 	      resources/atlasmanager.h \
+	      resources/avatardb.cpp \
+	      resources/avatardb.h \
 	      resources/beinginfo.cpp \
 	      resources/beinginfo.h \
 	      resources/chardb.cpp \
diff --git a/src/actorsprite.h b/src/actorsprite.h
index df895f879..badcb3b2d 100644
--- a/src/actorsprite.h
+++ b/src/actorsprite.h
@@ -50,7 +50,8 @@ public:
         MONSTER,
         FLOOR_ITEM,
         PORTAL,
-        PET
+        PET,
+        AVATAR
     };
 
     enum TargetCursorSize
diff --git a/src/being.cpp b/src/being.cpp
index de5ecc56e..efbfa35c6 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -48,6 +48,7 @@
 #include "net/npchandler.h"
 #include "net/playerhandler.h"
 
+#include "resources/avatardb.h"
 #include "resources/emotedb.h"
 #include "resources/iteminfo.h"
 #include "resources/monsterdb.h"
@@ -251,6 +252,12 @@ void Being::setSubtype(const uint16_t subtype)
             mYDiff = mInfo->getSortOffsetY();
         }
     }
+    else if (mType == AVATAR)
+    {
+        mInfo = AvatarDB::get(mSubType);
+        if (mInfo)
+            setupSpriteDisplay(mInfo->getDisplay(), false);
+    }
     else if (mType == PET)
     {
         mInfo = PETDB::get(mId);
diff --git a/src/client.cpp b/src/client.cpp
index f01d5b12c..f02759c01 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -77,6 +77,7 @@
 #include "net/npchandler.h"
 #include "net/partyhandler.h"
 
+#include "resources/avatardb.h"
 #include "resources/chardb.h"
 #include "resources/colordb.h"
 #include "resources/emotedb.h"
@@ -759,6 +760,7 @@ void Client::gameClear()
     ItemDB::unload();
     MonsterDB::unload();
     NPCDB::unload();
+    AvatarDB::unload();
     PaletteDB::unload();
     PETDB::unload();
     StatusEffect::unload();
@@ -1408,6 +1410,7 @@ int Client::gameExec()
 #ifdef MANASERV_SUPPORT
                     SpecialDB::load();
 #endif
+                    AvatarDB::load();
                     NPCDB::load();
                     PETDB::load();
                     EmoteDB::load();
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 86755ad41..598926546 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -710,7 +710,7 @@ void NpcDialog::showAvatar(const uint16_t avatarId)
     if (needShow)
     {
         delete mAvatarBeing;
-        mAvatarBeing = new Being(0, ActorSprite::NPC, avatarId, nullptr);
+        mAvatarBeing = new Being(0, ActorSprite::AVATAR, avatarId, nullptr);
         mPlayerBox->setPlayer(mAvatarBeing);
         if (!mAvatarBeing->empty())
         {
diff --git a/src/resources/avatardb.cpp b/src/resources/avatardb.cpp
new file mode 100644
index 000000000..e18eff5c2
--- /dev/null
+++ b/src/resources/avatardb.cpp
@@ -0,0 +1,117 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-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/avatardb.h"
+
+#include "logger.h"
+
+#include "net/net.h"
+
+#include "resources/beinginfo.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+
+#include "configuration.h"
+
+#include "debug.h"
+
+namespace
+{
+    BeingInfos mAvatarInfos;
+    bool mLoaded = false;
+}
+
+void AvatarDB::load()
+{
+    if (mLoaded)
+        unload();
+
+    XML::Document doc("avatars.xml");
+    const XmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlNameEqual(rootNode, "avatars"))
+    {
+        logger->log1("Avatars Database: Error while loading avatars.xml!");
+        mLoaded = true;
+        return;
+    }
+
+    for_each_xml_child_node(avatarNode, rootNode)
+    {
+        if (!xmlNameEqual(avatarNode, "avatar"))
+            continue;
+
+        BeingInfo *const currentInfo = new BeingInfo;
+
+        currentInfo->setName(XML::langProperty(
+            // TRANSLATORS: unknown info name
+            avatarNode, "name", _("unnamed")));
+
+        currentInfo->setTargetOffsetX(XML::getProperty(avatarNode,
+            "targetOffsetX", 0));
+
+        currentInfo->setTargetOffsetY(XML::getProperty(avatarNode,
+            "targetOffsetY", 0));
+
+        SpriteDisplay display;
+
+        // iterate <sprite>s and <sound>s
+        for_each_xml_child_node(spriteNode, avatarNode)
+        {
+            if (xmlNameEqual(spriteNode, "sprite"))
+            {
+                if (!spriteNode->xmlChildrenNode)
+                    continue;
+
+                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);
+            }
+        }
+        currentInfo->setDisplay(display);
+
+        mAvatarInfos[XML::getProperty(avatarNode, "id", 0)] = currentInfo;
+    }
+
+    mLoaded = true;
+}
+
+void AvatarDB::unload()
+{
+    delete_all(mAvatarInfos);
+    mAvatarInfos.clear();
+    mLoaded = false;
+}
+
+BeingInfo *AvatarDB::get(const int id)
+{
+    BeingInfoIterator i = mAvatarInfos.find(id);
+    if (i == mAvatarInfos.end())
+        return BeingInfo::unknown;
+    else
+        return i->second;
+}
diff --git a/src/resources/avatardb.h b/src/resources/avatardb.h
new file mode 100644
index 000000000..2a74d1c2e
--- /dev/null
+++ b/src/resources/avatardb.h
@@ -0,0 +1,39 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-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 AVATAR_DB_H
+#define AVATAR_DB_H
+
+#include "localconsts.h"
+
+class BeingInfo;
+
+namespace AvatarDB
+{
+    void load();
+
+    void unload();
+
+    BeingInfo *get(const int id) A_WARN_UNUSED;
+}
+
+#endif