diff options
| author | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
| commit | 9071a692116745f2cafd8556cbff28095910730e (patch) | |
| tree | 6fbc96a1cb00558c4015d1eff25f45b2c6ccdcb8 /src/game.cpp | |
| parent | 2e94f4e92821bad6ebb328d00b2bd918c4b1b99e (diff) | |
| parent | 0257eaf4d3945eac7cb3e50ccf8dfef18fa29698 (diff) | |
| download | mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.gz mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.bz2 mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.xz mana-client-9071a692116745f2cafd8556cbff28095910730e.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 15 |
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 |