1 files changed, 5 insertions, 8 deletions
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index cc3b30f7..1ed86a05 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -22,7 +22,6 @@
 #ifndef EMOTE_DB_H
 #define EMOTE_DB_H
 
-#include <map>
 #include <string>
 
 #include "utils/xml.h"
@@ -31,13 +30,12 @@ class ImageSprite;
 
 struct Emote
 {
+    int id;
+    int effectId;
     std::string name;
     ImageSprite *sprite;
-    int effect;
 };
 
-using Emotes = std::map<int, Emote *>;
-
 /**
  * Emote information database.
  */
@@ -51,11 +49,10 @@ namespace EmoteDB
 
     void unload();
 
-    const Emote *get(int id);
-
-    int getLast();
+    const Emote &get(int id);
+    const Emote &getByIndex(int index);
 
-    using EmotesIterator = Emotes::iterator;
+    int getEmoteCount();
 }
 
 #endif // EMOTE_DB_H