added global ffz and bttv emotes

2017-01-26 17:26:20 +01:00
parent e0abfb9a1f
commit fb14e86364
7 changed files with 215 additions and 9 deletions
@@ -1,6 +1,7 @@
 #include "channels.h"
 #include "colorscheme.h"
 #include "emojis.h"
+#include "emotes.h"
 #include "ircmanager.h"
 #include "resources.h"
 #include "settings.h"
@@ -21,6 +22,7 @@ main(int argc, char *argv[])
    Settings::getInstance().load();
    Resources::load();
    Emojis::loadEmojis();
+    Emotes::loadGlobalEmotes();

    ColorScheme::getInstance().setColors(0, -0.8);