From 760184661da4b96cc390ceb161646c8a83712acf Mon Sep 17 00:00:00 2001
From: Stefan Dombrowski <stefan@uni-bonn.de>
Date: Sat, 22 Jan 2011 21:20:51 +0100
Subject: Fixing pick-up with joystick

The pick-up with the joystick happend on the wrong tile.
Bug was reported by Feufochmar on IRC.
---
 src/game.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/game.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index cd36dcdd..512b8b5f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -779,9 +779,6 @@ void Game::handleInput()
             return;
         }
 
-        const Vector &pos = player_node->getPosition();
-        const Uint16 x = (int) pos.x / 32;
-        const Uint16 y = (int) pos.y / 32;
         unsigned char direction = 0;
 
         // Translate pressed keys to movement and direction
@@ -899,6 +896,9 @@ void Game::handleInput()
         {
             if (joystick->buttonPressed(1))
             {
+                const int x = player_node->getTileX();
+                const int y = player_node->getTileY();
+
                 FloorItem *item = floorItemManager->findByCoordinates(x, y);
 
                 if (item)
-- 
cgit v1.2.3-70-g09d2