From c17120c9838665fd546c6ae7a1d81de79659d429 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Tue, 22 Jul 2008 15:26:00 +0000
Subject: User can now configure which modifier key is used for smilies.

---
 src/game.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/game.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index 8961c859..cc37fc5a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -511,7 +511,11 @@ void Game::handleInput()
                         used = true;
                         break;
                 }
+            }
 
+            // Smilie
+            if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
+            {
                 // Emotions
                 Uint8 emotion;
                 switch (event.key.keysym.sym)
@@ -535,6 +539,7 @@ void Game::handleInput()
                 {
                     player_node->emote(emotion);
                     used = true;
+                    return;
                 }
             }
             switch (event.key.keysym.sym)
-- 
cgit v1.2.3-70-g09d2