From 132da5396b83405801e3271094359e8d5b88d5ab Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Sun, 31 Aug 2008 13:14:28 +0000
Subject: added emot command

---
 src/game/client/components/emoticon.cpp | 6 ++++++
 src/game/client/components/emoticon.hpp | 1 +
 2 files changed, 7 insertions(+)

(limited to 'src/game')

diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp
index bed050dd..af60ac19 100644
--- a/src/game/client/components/emoticon.cpp
+++ b/src/game/client/components/emoticon.cpp
@@ -18,9 +18,15 @@ void EMOTICON::con_key_emoticon(void *result, void *user_data)
 	((EMOTICON *)user_data)->active = console_arg_int(result, 0) != 0;
 }
 
+void EMOTICON::con_emote(void *result, void *user_data)
+{
+	((EMOTICON *)user_data)->emote(console_arg_int(result, 0));
+}
+
 void EMOTICON::on_init()
 {
 	MACRO_REGISTER_COMMAND("+emote", "", con_key_emoticon, this);
+	MACRO_REGISTER_COMMAND("emote", "", con_emote, this);
 }
 
 void EMOTICON::on_reset()
diff --git a/src/game/client/components/emoticon.hpp b/src/game/client/components/emoticon.hpp
index 1acb741d..22e1c44b 100644
--- a/src/game/client/components/emoticon.hpp
+++ b/src/game/client/components/emoticon.hpp
@@ -12,6 +12,7 @@ class EMOTICON : public COMPONENT
 	int selected_emote;
 
 	static void con_key_emoticon(void *result, void *user_data);
+	static void con_emote(void *result, void *user_data);
 	
 public:
 	EMOTICON();
-- 
cgit 1.4.1