2 files changed, 3 insertions, 16 deletions
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index 691211ca..cba744dd 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -28,6 +28,7 @@
 #include "../animatedsprite.h"
 #include "../configuration.h"
 #include "../graphics.h"
+#include "../localplayer.h"
 #include "../log.h"
 
 #include "../resources/emotedb.h"
@@ -52,14 +53,7 @@ EmoteContainer::EmoteContainer():
     // 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));
     }
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
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;