summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/game.cpp b/src/game.cpp
index d3ca2e7c..b56cbdde 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -920,19 +920,8 @@ void Game::handleInput()
if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
(joystick && joystick->buttonPressed(0)))
{
- Being *target = NULL;
-
- bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
- // A set target has highest priority
- if (!player_node->getTarget())
- {
- Uint16 targetX = x, targetY = y;
-
- // Only auto target Monsters
- target = beingManager->findNearestLivingBeing(targetX, targetY,
- 20, Being::MONSTER);
- }
- player_node->attack(target, newTarget);
+ if (player_node->getTarget())
+ player_node->attack(player_node->getTarget(), true);
}
#endif