1 files changed, 4 insertions, 2 deletions
diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp
index 9fb64492a..238ae75f5 100644
--- a/src/emoteshortcut.cpp
+++ b/src/emoteshortcut.cpp
@@ -44,12 +44,14 @@ EmoteShortcut::~EmoteShortcut()
 
 void EmoteShortcut::load()
 {
-    for (int i = 0, j = 0; i <= EmoteDB::getLast() && j < SHORTCUT_EMOTES; i++)
+    for (unsigned char i = 0, j = 0;
+         i <= EmoteDB::getLast() && j < SHORTCUT_EMOTES;
+         i++)
     {
         const AnimatedSprite* sprite = EmoteDB::getAnimation(i, true);
         if (sprite)
         {
-            mEmotes[j] = i + 1;
+            mEmotes[j] = static_cast<unsigned char>(i + 1);
             j ++;
         }
     }