diff options
| author | David Athay <ko2fan@gmail.com> | 2009-05-18 18:18:23 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-05-18 18:18:23 +0100 |
| commit | 72660d2c33773f0f74663efe6f9ac47648cdf283 (patch) | |
| tree | e21d5a283eefaa5767d942f602c718eae42cbd4a /src/gui/viewport.cpp | |
| parent | e7df8c9dd7ebc14c1263c19c6a238ebcf4fd9465 (diff) | |
| download | mana-72660d2c33773f0f74663efe6f9ac47648cdf283.tar.gz mana-72660d2c33773f0f74663efe6f9ac47648cdf283.tar.bz2 mana-72660d2c33773f0f74663efe6f9ac47648cdf283.tar.xz mana-72660d2c33773f0f74663efe6f9ac47648cdf283.zip | |
Added target combat
Diffstat (limited to 'src/gui/viewport.cpp')
| -rw-r--r-- | src/gui/viewport.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 2c3f4007..cbde95c4 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -358,19 +358,15 @@ void Viewport::mousePressed(gcn::MouseEvent &event) keyboard.isKeyActive(keyboard.KEY_ATTACK)) { player_node->setGotoTarget(being); -//TODO: This can be changed when TMWServ moves to target based combat -#ifdef TMWSERV_SUPPORT - player_node->attack(); -#else + player_node->attack(being, !keyboard.isKeyActive(keyboard.KEY_TARGET)); -#endif } else { #ifdef TMWSERV_SUPPORT - player_node->setDestination(event.getX() + (int) mPixelViewX, + player_node->setDestination(event.getX() + (int) mPixelViewX, event.getY() + (int) mPixelViewY); #else player_node->setDestination(tilex, tiley); |