diff options
| author | Dennis Friis <peavey@inspircd.org> | 2009-05-21 01:36:50 +0200 |
|---|---|---|
| committer | Dennis Friis <peavey@inspircd.org> | 2009-05-21 01:36:50 +0200 |
| commit | 431e131ea8c38929d2ee61bd5066f856213882a1 (patch) | |
| tree | 908b9276590aadd44478b9de410d13be8c83e6b5 /src/gui | |
| parent | 86a055d46df5a262fce0f76697cc3d54e75b19e1 (diff) | |
| parent | d82bc279c910a5ba2fd3764a41e680448c8ba1e8 (diff) | |
| download | mana-431e131ea8c38929d2ee61bd5066f856213882a1.tar.gz mana-431e131ea8c38929d2ee61bd5066f856213882a1.tar.bz2 mana-431e131ea8c38929d2ee61bd5066f856213882a1.tar.xz mana-431e131ea8c38929d2ee61bd5066f856213882a1.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/viewport.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index cbde95c4..787723c0 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -357,20 +357,12 @@ void Viewport::mousePressed(gcn::MouseEvent &event) if (player_node->withinAttackRange(being) || keyboard.isKeyActive(keyboard.KEY_ATTACK)) { - player_node->setGotoTarget(being); - player_node->attack(being, !keyboard.isKeyActive(keyboard.KEY_TARGET)); - } else { -#ifdef TMWSERV_SUPPORT - player_node->setDestination(event.getX() + (int) mPixelViewX, - event.getY() + (int) mPixelViewY); -#else - player_node->setDestination(tilex, tiley); -#endif + player_node->setGotoTarget(being); } break; default: @@ -399,9 +391,9 @@ void Viewport::mousePressed(gcn::MouseEvent &event) event.getY() + (int) mPixelViewY); } #else - player_node->stopAttack(); player_node->setDestination(tilex, tiley); #endif + player_node->stopAttack(); mPlayerFollowMouse = true; } } |