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, 4 insertions, 4 deletions

diff --git a/src/gui/smileycontainer.h b/src/gui/smileycontainer.h
index ddfe9ec5..88ca0b48 100644
--- a/src/gui/smileycontainer.h
+++ b/src/gui/smileycontainer.h
@@ -33,7 +33,7 @@
 
 class Image;
 class Inventory;
-class Item;
+class Emote;
 
 namespace gcn {
     class SelectionListener;
@@ -107,12 +107,12 @@ class SmileyContainer : public gcn::Widget,
 
          * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
          */
-        void setSelectedItemIndex(int index);
+        void setSelectedEmoteIndex(int index);
 
         /**
          * Find the current item index by the most recently used item ID
          */
-        void refindSelectedItem(void);
+        void refindSelectedEmote(void);
 
         /**
          * Determine and set the height of the container.
@@ -126,7 +126,7 @@ class SmileyContainer : public gcn::Widget,
 
         ImageSet *mSmileyImg;
         Image *mSelImg;
-        int mSelectedItemIndex;
+        int mSelectedEmoteIndex;
 
         int mMaxSmiley;