summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-07-27 16:28:37 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-07-27 16:28:37 +0000
commitab74313ac96b5259f17555085f1fdb9780cd387c (patch)
tree1f37e7b19dd889f170d5339d5a33bd9984637d30 /src/game.cpp
parenta0a365b5e89896a40d6f30be29184506bdc6214d (diff)
downloadmana-ab74313ac96b5259f17555085f1fdb9780cd387c.tar.gz
mana-ab74313ac96b5259f17555085f1fdb9780cd387c.tar.bz2
mana-ab74313ac96b5259f17555085f1fdb9780cd387c.tar.xz
mana-ab74313ac96b5259f17555085f1fdb9780cd387c.zip
Target the nearest monster on joystick button 3v0.0.25
Should be made configurable later (Mantis 151)
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 0773b8e7..37375ca2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -810,12 +810,11 @@ void Game::handleInput()
player_node->attack(target, newTarget);
}
- // Target the nearest player if 'q' is pressed
- if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
- //if (keys[SDLK_q])
+ // Target the nearest player
+ if (keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER))
{
- Being *target =
- beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
+ Being *target = beingManager->findNearestLivingBeing(
+ player_node, 20, Being::PLAYER);
if (target)
{
@@ -823,9 +822,9 @@ void Game::handleInput()
}
}
- // Target the nearest monster if 'a' pressed
- if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
- //if (keys[SDLK_a])
+ // Target the nearest monster
+ if (keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST)
+ || (joystick && joystick->buttonPressed(3)))
{
Being *target =
beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);