Merge branch 'master' into feature/http-ms

# Conflicts:
#	src/networkmanager.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/src/emotes.cpp b/src/emotes.cpp
index 541a6e2..67a243b 100644
--- a/src/emotes.cpp
+++ b/src/emotes.cpp
@@ -126,9 +126,9 @@ void Courtroom::set_emote_page()
     AOEmoteButton *f_emote = ui_emote_list.at(n_emote);
 
     if (n_real_emote == current_emote)
-      f_emote->set_char_image(current_char, n_real_emote, "_on");
+      f_emote->set_char_image(current_char, n_real_emote, true);
     else
-      f_emote->set_char_image(current_char, n_real_emote, "_off");
+      f_emote->set_char_image(current_char, n_real_emote, false);
 
     f_emote->show();
     f_emote->setToolTip(QString::number(n_real_emote + 1) + ": " +
@@ -158,7 +158,7 @@ void Courtroom::select_emote(int p_id)
 
   if (current_emote >= min && current_emote <= max)
     ui_emote_list.at(current_emote % max_emotes_on_page)
-        ->set_char_image(current_char, current_emote, "_off");
+        ->set_char_image(current_char, current_emote, false);
 
   int old_emote = current_emote;
 
@@ -166,7 +166,7 @@ void Courtroom::select_emote(int p_id)
 
   if (current_emote >= min && current_emote <= max)
     ui_emote_list.at(current_emote % max_emotes_on_page)
-        ->set_char_image(current_char, current_emote, "_on");
+        ->set_char_image(current_char, current_emote, true);
 
   int emote_mod = ao_app->get_emote_mod(current_char, current_emote);