Move emote sprite loading into EmoteDB

9 files changed, 29 insertions, 57 deletions

diff --git a/src/being.cpp b/src/being.cpp
index d94d50d9..54908b07 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -52,10 +52,8 @@
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
-#include "utils/xml.h"
 
 int Being::mNumberOfHairstyles = 1;
-std::vector<AnimatedSprite*> Being::emotionSet;
 
 static const int X_SPEECH_OFFSET = 18;
 static const int Y_SPEECH_OFFSET = 60;
@@ -461,7 +459,7 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     const int emotionIndex = mEmotion - 1;
 
     if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast())
-        emotionSet[emotionIndex]->draw(graphics, px, py);
+        EmoteDB::getAnimation(emotionIndex)->draw(graphics, px, py);
 }
 
 void Being::drawSpeech(int offsetX, int offsetY)
@@ -580,29 +578,3 @@ void Being::setTargetAnimation(SimpleAnimation* animation)
     mUsedTargetCursor->reset();
 }
 
-void Being::load()
-{
-    // Setup emote sprites
-    for (int i = 0; i <= EmoteDB::getLast(); i++)
-    {
-        EmoteInfo info = EmoteDB::get(i);
-
-        std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
-        int variant = info.sprites.front()->variant;
-        emotionSet.push_back(AnimatedSprite::load(file, variant));
-    }
-
-    // Hairstyles are encoded as negative numbers.  Count how far negative
-    // we can go.
-    int hairstyles = 1;
-    while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml")
-    {
-        hairstyles++;
-    }
-    mNumberOfHairstyles = hairstyles;
-}
-
-void Being::cleanup()
-{
-    delete_all(emotionSet);
-}
diff --git a/src/being.h b/src/being.h
index 85e0c080..6f3125c8 100644
--- a/src/being.h
+++ b/src/being.h
@@ -387,8 +387,6 @@ class Being : public Sprite
          */
         void untarget() { mUsedTargetCursor = NULL; }
 
-        AnimatedSprite* getEmote(int index) { return emotionSet[index]; }
-
         void setEmote(Uint8 emotion, Uint8 emote_time)
         {
             mEmotion = emotion;
@@ -404,10 +402,6 @@ class Being : public Sprite
         virtual AnimatedSprite* getSprite(int index) const
             { return mSprites[index]; }
 
-        static void load();
-
-        static void cleanup();
-
     protected:
         /**
          * Sets the new path for this being.
@@ -450,8 +444,6 @@ class Being : public Sprite
         Uint16 mHairStyle, mHairColor;
         Gender mGender;
         int mPx, mPy;                   /**< Pixel coordinates */
-        Uint16 mStunMode;		/**< Stun mode; zero if not stunned */
-        StatusEffects mStatusEffects;	/**< Bitset of active status effects */
 
         gcn::Color mNameColor;
 
@@ -474,8 +466,6 @@ class Being : public Sprite
 
         // Target cursor being used
         SimpleAnimation* mUsedTargetCursor;
-
-        static std::vector<AnimatedSprite*> emotionSet;    /**< Emoticons used by beings */
 };
 
 #endif
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index 9764ab9c..22b4cf50 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -54,7 +54,7 @@ EmoteContainer::EmoteContainer():
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
-        mEmoteImg.push_back(player_node->getEmote(i));
+        mEmoteImg.push_back(EmoteDB::getAnimation(i));
     }
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
index 260f1754..7e88cb71 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -122,7 +122,7 @@ class EmoteContainer : public gcn::Widget,
          */
         void distributeValueChangedEvent(void);
 
-        std::vector<AnimatedSprite*> mEmoteImg;
+        std::vector<const AnimatedSprite*> mEmoteImg;
         Image *mSelImg;
         int mSelectedEmoteIndex;
 
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index f4cef106..8c9df14e 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -60,7 +60,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
-        mEmoteImg.push_back(player_node->getEmote(i));
+        mEmoteImg.push_back(EmoteDB::getAnimation(i));
     }
 
     mMaxItems = EmoteDB::getLast() < MAX_ITEMS ? EmoteDB::getLast() : MAX_ITEMS;
@@ -113,7 +113,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
     if (mEmoteMoved)
     {
         // Draw the emote image being dragged by the cursor.
-        AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1];
+        const AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1];
         if (sprite)
         {
             const int tPosX = mCursorPosX - (sprite->getWidth() / 2);
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index 4c4b3614..ff9f929c 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -69,7 +69,7 @@ class EmoteShortcutContainer : public ShortcutContainer
         void mouseReleased(gcn::MouseEvent &event);
 
     private:
-        std::vector<AnimatedSprite*> mEmoteImg;
+        std::vector<const AnimatedSprite*> mEmoteImg;
 
         bool mEmoteClicked;
         int mEmoteMoved;
diff --git a/src/main.cpp b/src/main.cpp
index ec075a4c..a7032fb1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -479,8 +479,6 @@ void exit_engine()
     // Shutdown sound
     sound.close();
 
-    Being::cleanup();
-
     // Unload XML databases
     ColorDB::unload();
     EmoteDB::unload();
@@ -941,7 +939,6 @@ int main(int argc, char *argv[])
                     MonsterDB::load();
                     NPCDB::load();
                     EmoteDB::load();
-                    Being::load(); // Hairstyles and emotions
 
                     state = CHAR_CONNECT_STATE;
                     break;
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 23a7833c..ec87c5cd 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -21,6 +21,7 @@
 
 #include "emotedb.h"
 
+#include "../animatedsprite.h"
 #include "../log.h"
 
 #include "../utils/xml.h"
@@ -41,9 +42,8 @@ void EmoteDB::load()
     mLastEmote = 0;
 
     EmoteSprite *unknownSprite = new EmoteSprite;
-    unknownSprite->sprite = "error.xml";
+    unknownSprite->sprite = AnimatedSprite::load("error.xml");
     unknownSprite->name = "unknown";
-    unknownSprite->variant = 0;
     mUnknown.sprites.push_back(unknownSprite);
 
     logger->log("Initializing emote database...");
@@ -77,8 +77,10 @@ void EmoteDB::load()
             if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
             {
                 EmoteSprite *currentSprite = new EmoteSprite;
-                currentSprite->sprite = (const char*) spriteNode->xmlChildrenNode->content;
-                currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);
+                std::string file = "graphics/sprites/" + (std::string)
+                            (const char*) spriteNode->xmlChildrenNode->content;
+                currentSprite->sprite = AnimatedSprite::load(file,
+                                XML::getProperty(spriteNode, "variant", 0));
                 currentInfo->sprites.push_back(currentSprite);
             }
             else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
@@ -102,6 +104,7 @@ void EmoteDB::unload()
     {
         while (!i->second->sprites.empty())
         {
+            delete i->second->sprites.front()->sprite;
             delete i->second->sprites.front();
             i->second->sprites.pop_front();
         }
@@ -112,6 +115,7 @@ void EmoteDB::unload()
 
     while (!mUnknown.sprites.empty())
     {
+        delete mUnknown.sprites.front()->sprite;
         delete mUnknown.sprites.front();
         mUnknown.sprites.pop_front();
     }
@@ -119,21 +123,27 @@ void EmoteDB::unload()
     mLoaded = false;
 }
 
-const EmoteInfo& EmoteDB::get(int id)
+const EmoteInfo *EmoteDB::get(int id)
 {
     EmoteInfosIterator i = mEmoteInfos.find(id);
 
     if (i == mEmoteInfos.end())
     {
         logger->log("EmoteDB: Warning, unknown emote ID %d requested", id);
-        return mUnknown;
+        return &mUnknown;
     }
     else
     {
-        return *(i->second);
+        return i->second;
     }
 }
 
+const AnimatedSprite* EmoteDB::getAnimation(int id)
+{
+    const EmoteInfo *info = get(id);
+    return info->sprites.front()->sprite;
+}
+
 const int& EmoteDB::getLast()
 {
     return mLastEmote;
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index d0cd4d71..48e1d53c 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -26,11 +26,12 @@
 #include <map>
 #include <string>
 
+class AnimatedSprite;
+
 struct EmoteSprite
 {
-    std::string sprite;
+    const AnimatedSprite *sprite;
     std::string name;
-    int variant;
 };
 
 struct EmoteInfo
@@ -50,7 +51,9 @@ namespace EmoteDB
 
     void unload();
 
-    const EmoteInfo& get(int id);
+    const EmoteInfo *get(int id);
+
+    const AnimatedSprite *getAnimation(int id);
 
     const int& getLast();