Made emotes load in only one location, as well as fixing the code on the

being so that the last emote draws (which got broken).

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index edaa8602..a7347bb0 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -57,14 +57,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
-        EmoteInfo info = EmoteDB::get(i);
-
-        if (info.sprites != EmoteDB::getUnknown().sprites)
-        { 
-            std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
-            int variant = info.sprites.front()->variant;
-            mEmoteImg.push_back(AnimatedSprite::load(file, variant));
-        }
+        mEmoteImg.push_back(player_node->getEmote(i));
     }
 
     mMaxItems = MAX_ITEMS;