From 221c682c11a203e33ab77b471213b5d05c40522d Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 24 Feb 2009 20:39:20 -0700 Subject: Prioritize monsters when targeting Players are then the next highest priority --- src/game.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 89687054..cb85fc5c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -873,11 +873,11 @@ void Game::handleInput() !keyboard.isKeyActive(keyboard.KEY_TARGET)) { Being::Type currentTarget = Being::UNKNOWN; - if (keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER)) - currentTarget = Being::PLAYER; - else if (keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || + if (keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || (joystick && joystick->buttonPressed(3))) currentTarget = Being::MONSTER; + else if (keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER)) + currentTarget = Being::PLAYER; else if (keyboard.isKeyActive(keyboard.KEY_TARGET_NPC)) currentTarget = Being::NPC; -- cgit v1.2.3-70-g09d2