1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 82fb9f8d..f7a6ca2b 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -20,11 +20,11 @@
 
 #include "gui/widgets/emoteshortcutcontainer.h"
 
-#include "animatedsprite.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
 #include "graphics.h"
 #include "inventory.h"
+#include "imagesprite.h"
 #include "item.h"
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
@@ -32,10 +32,10 @@
 #include "log.h"
 
 #include "gui/palette.h"
-#include "gui/theme.h"
 
 #include "resources/emotedb.h"
 #include "resources/image.h"
+#include "resources/theme.h"
 
 #include "utils/dtor.h"
 
@@ -51,12 +51,12 @@ EmoteShortcutContainer::EmoteShortcutContainer():
 
     mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png");
 
-    mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
+    mBackgroundImg->setAlpha(config.getFloatValue("guialpha"));
 
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
-        mEmoteImg.push_back(EmoteDB::getAnimation(i));
+        mEmoteImg.push_back(EmoteDB::get(i)->sprite);
     }
 
     mMaxItems = EmoteDB::getLast() < MAX_ITEMS ? EmoteDB::getLast() : MAX_ITEMS;
@@ -72,9 +72,9 @@ EmoteShortcutContainer::~EmoteShortcutContainer()
 
 void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 {
-    if (config.getValue("guialpha", 0.8) != mAlpha)
+    if (config.getFloatValue("guialpha") != mAlpha)
     {
-        mAlpha = config.getValue("guialpha", 0.8);
+        mAlpha = config.getFloatValue("guialpha");
         mBackgroundImg->setAlpha(mAlpha);
     }
 
@@ -106,7 +106,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
     if (mEmoteMoved)
     {
         // Draw the emote image being dragged by the cursor.
-        const AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1];
+        const ImageSprite* sprite = mEmoteImg[mEmoteMoved - 1];
         if (sprite)
         {
             const int tPosX = mCursorPosX - (sprite->getWidth() / 2);