Changed a few emote variable names to be more sensible, as well as

removing emotions.png from the client data files (should have never
been there to begin with, IMO). TODO: Simplify the emote code so that
there is a lot less redundant code, as well as make filling out the
possible emotes more flexible.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/being.cpp b/src/being.cpp
index ba3107db..5eb62b2d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -44,6 +44,7 @@
 #include "gui/speechbubble.h"
 
 #include "utils/dtor.h"
+#include "utils/gettext.h"  
 #include "utils/tostring.h"
 #include "utils/xml.h"
 
@@ -91,8 +92,8 @@ Being::Being(int id, int job, Map *map):
     {
         // Load the emotion set
         ResourceManager *rm = ResourceManager::getInstance();
-        emotionSet = rm->getImageSet("graphics/gui/emotions.png", 30, 32);
-        if (!emotionSet) logger->error("Unable to load emotions!");
+        emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32);
+        if (!emotionSet) logger->error(_("Unable to load emotions"));
 
         // Hairstyles are encoded as negative numbers.  Count how far negative we can go.
         int hairstyles = 1;