diff options
| author | Forge <jgrimbert@free.fr> | 2009-01-09 00:03:53 +0100 |
|---|---|---|
| committer | Forge <jgrimbert@free.fr> | 2009-01-09 00:03:53 +0100 |
| commit | 611210b1e0fd9cbaed38b229462e109d8f4be385 (patch) | |
| tree | d2fc4f7465ccd611e918a8905d7478aacd458acb /src/game.cpp | |
| parent | 0b2e6c53a158b820a3e3610372c98185a4dce30a (diff) | |
| download | mana-611210b1e0fd9cbaed38b229462e109d8f4be385.tar.gz mana-611210b1e0fd9cbaed38b229462e109d8f4be385.tar.bz2 mana-611210b1e0fd9cbaed38b229462e109d8f4be385.tar.xz mana-611210b1e0fd9cbaed38b229462e109d8f4be385.zip | |
Now, the real stage 2.0 of smiley window.
All is done, and all files are now in the tree.
(ok, copyright of new files is still opened... do as you want, if you
care)
Signed-off-by: Forge <jgrimbert@free.fr>
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/game.cpp b/src/game.cpp index 76eb6b82..da733fe3 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -36,6 +36,7 @@ #include "flooritemmanager.h" #include "graphics.h" #include "itemshortcut.h" +#include "smileyshortcut.h" #include "joystick.h" #include "keyboardconfig.h" #include "localplayer.h" @@ -556,15 +557,10 @@ void Game::handleInput() if (keyboard.isKeyActive(keyboard.KEY_SMILIE)) { // Emotions - Uint8 emotion=keyboard.getKeySmilieOffset(event.key.keysym.sym); - /** - * Later here: increase the size of emotion, - * and get the entry from the smiley - * shortcut object - */ + int emotion=keyboard.getKeySmilieOffset(event.key.keysym.sym); if (emotion) { - player_node->emote(emotion); + smileyShortcut->useSmiley(emotion); used = true; return; } |