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

diff --git a/src/gui/smileywindow.cpp b/src/gui/smileywindow.cpp
index 570eb45c..e3e821ff 100644
--- a/src/gui/smileywindow.cpp
+++ b/src/gui/smileywindow.cpp
@@ -45,10 +45,10 @@ SmileyWindow::SmileyWindow():
 
     mUseButton = new Button(_("Use"), "use", this);
 
-    mItems = new SmileyContainer();
-    mItems->addSelectionListener(this);
+    mEmotes = new SmileyContainer();
+    mEmotes->addSelectionListener(this);
 
-    mInvenScroll = new ScrollArea(mItems);
+    mInvenScroll = new ScrollArea(mEmotes);
     mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
     draw();
@@ -63,12 +63,12 @@ SmileyWindow::SmileyWindow():
 
 void SmileyWindow::action(const gcn::ActionEvent &event)
 {
-    int item = mItems->getSelectedSmiley();
+    int emote = mEmotes->getSelectedSmiley();
 
-    if (!item)
+    if (!emote)
         return;
 
-    player_node->emote(item);
+    player_node->emote(emote);
 }
 
 
@@ -95,5 +95,5 @@ void SmileyWindow::widgetResized(const gcn::Event &event)
 
 int SmileyWindow::getSelectedSmiley() const
 {
-    return mItems->getSelectedSmiley();
+    return mEmotes->getSelectedSmiley();
 }