summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2009-08-01 22:39:01 -0400
committerChuck Miller <shadowmil@gmail.com>2009-08-01 22:39:01 -0400
commitd1c92918319afa943bbc0ced77765563f1fdf559 (patch)
treeedd03730125a0dbb95f0d1c0fb41b368949d41c6 /src/game.cpp
parent455b56f0a3aa89fec063696ef86aa39986b21a5f (diff)
downloadMana-d1c92918319afa943bbc0ced77765563f1fdf559.tar.gz
Mana-d1c92918319afa943bbc0ced77765563f1fdf559.tar.bz2
Mana-d1c92918319afa943bbc0ced77765563f1fdf559.tar.xz
Mana-d1c92918319afa943bbc0ced77765563f1fdf559.zip
Fixes pickup items on eA, also cleaned up some code
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 abb74b2a..f424ad50 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -759,9 +759,14 @@ void Game::handleInput()
{
case KeyboardConfig::KEY_PICKUP:
{
+#ifdef TMWSERV_SUPPORT
const Vector &pos = player_node->getPosition();
Uint16 x = (int) pos.x / 32;
Uint16 y = (int) pos.y / 32;
+#else
+ Uint16 x = player_node->getTileX();
+ Uint16 y = player_node->getTileY();
+#endif
FloorItem *item =
floorItemManager->findByCoordinates(x, y);