Some rather pedantic changes. Unified all naming for emoticons in the

code so that only one term is used everywhere (to simplify
maintainability), as well as corrected several variable names and
comments where there was copy/pasted code, but it wasn't corrected. Also
moved emote shortcuts back to where they were originally, to reduce
player confusion when the next build comes around.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index bcffbae0..66f15f03 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -43,8 +43,8 @@ extern Window *minimap;
 extern Window *skillDialog;
 extern Window *statusWindow;
 extern Window *itemShortcutWindow;
-extern Window *smileyShortcutWindow;
-extern Window *smileyWindow;
+extern Window *emoteShortcutWindow;
+extern Window *emoteWindow;
 extern Window *tradeWindow;
 
 Setup::Setup():
@@ -138,8 +138,8 @@ void Setup::action(const gcn::ActionEvent &event)
         helpWindow->resetToDefaultSize();
         skillDialog->resetToDefaultSize();
         itemShortcutWindow->resetToDefaultSize();
-        smileyShortcutWindow->resetToDefaultSize();
-        smileyWindow->resetToDefaultSize();
+        emoteShortcutWindow->resetToDefaultSize();
+        emoteWindow->resetToDefaultSize();
         tradeWindow->resetToDefaultSize();
     }
 }