Fixed include order (pedantic change)

Conflicts:

	src/gui/smileycontainer.cpp

Signed-off-by: Ira Rice <irarice@gmail.com>

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;
 		}