summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-07-22 15:26:00 +0000
committerDavid Athay <ko2fan@gmail.com>2008-07-22 15:26:00 +0000
commitc17120c9838665fd546c6ae7a1d81de79659d429 (patch)
tree5e708b39bb73c7a2d6724031b799303071ae4a10 /src/game.cpp
parent93459202b58b6199e588b5c6768ef8889aa2aa9f (diff)
downloadmana-c17120c9838665fd546c6ae7a1d81de79659d429.tar.gz
mana-c17120c9838665fd546c6ae7a1d81de79659d429.tar.bz2
mana-c17120c9838665fd546c6ae7a1d81de79659d429.tar.xz
mana-c17120c9838665fd546c6ae7a1d81de79659d429.zip
User can now configure which modifier key is used for smilies.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp5
1 files changed, 5 insertions, 0 deletions
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)