1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index 7c05e263..bd40a932 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -22,18 +22,17 @@
 
 #include "gui/emotepopup.h"
 
-#include "animatedsprite.h"
+#include "imagesprite.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
 #include "graphics.h"
 #include "localplayer.h"
 #include "log.h"
 
-#include "gui/theme.h"
-
 #include "resources/emotedb.h"
 #include "resources/image.h"
 #include "resources/iteminfo.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -54,14 +53,14 @@ EmotePopup::EmotePopup():
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); ++i)
     {
-        mEmotes.push_back(EmoteDB::getAnimation(i));
+        mEmotes.push_back(EmoteDB::get(i)->sprite);
     }
 
     mSelectionImage = Theme::getImageFromTheme("selection.png");
     if (!mSelectionImage)
         logger->error("Unable to load selection.png");
 
-    mSelectionImage->setAlpha(config.getValue("guialpha", 0.8));
+    mSelectionImage->setAlpha(config.getFloatValue("guialpha"));
 
     addMouseListener(this);
     recalculateSize();