From 4c36de64284c060f2fbe097844e5ac24b354a4f5 Mon Sep 17 00:00:00 2001 From: peavey Date: Sun, 10 May 2009 23:56:13 +0200 Subject: Remove 'attack key targets' which was merged in from aethyra. If the botters want a combined key that does both target and attack for athena we could add a such, but its annoying when you play in an active style. --- src/game.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/game.cpp') 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 -- cgit v1.2.3-60-g2f50