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

diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp
new file mode 100644
index 00000000..66989d44
--- /dev/null
+++ b/src/emoteshortcut.cpp
@@ -0,0 +1,77 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "emoteshortcut.h"
+
+#include "configuration.h"
+#include "localplayer.h"
+
+#include "utils/tostring.h"
+
+EmoteShortcut::EmoteShortcut *emoteShortcut;
+
+EmoteShortcut::EmoteShortcut():
+    mEmoteSelected(0)
+{
+    for (int i = 0; i < SHORTCUT_EMOTES; i++)
+    {
+        mEmotes[i] = i + 1;
+    }
+    load();
+}
+
+EmoteShortcut::~EmoteShortcut()
+{
+    save();
+}
+
+void EmoteShortcut::load()
+{
+    for (int i = 0; i < SHORTCUT_EMOTES; i++)
+    {
+        int emoteId = (int) config.getValue("emoteshortcut" + toString(i), i + 1);
+
+        if (emoteId)
+        {
+            mEmotes[i] = emoteId;
+        }
+    }
+}
+
+void EmoteShortcut::save()
+{
+    for (int i = 0; i < SHORTCUT_EMOTES; i++)
+    {
+        const int emoteId = mEmotes[i] ? mEmotes[i] : 0;
+        config.setValue("emoteshortcut" + toString(i), emoteId);
+    }
+}
+
+void EmoteShortcut::useEmote(int index)
+{
+    if ((index > 0) && (index <= SHORTCUT_EMOTES))
+    {
+       if (mEmotes[index - 1] > 0)
+       {
+          player_node->emote(mEmotes[index - 1]);
+       }
+    }
+}