From dc4cfce2e367b93b9733869298a3459883df2e3d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 06:02:05 +0000
Subject: Fixed mouse attacks and targeting.

---
 src/gui/viewport.cpp | 6 ++----
 src/localplayer.cpp  | 6 +++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 426906a0..b6c25dfb 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -300,16 +300,14 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (being->mAction == Being::DEAD)
                         break;
 
-                    if (keyboard.isKeyActive(keyboard.KEY_TARGET) || player_node->withinAttackRange(being))
+                    if (player_node->withinAttackRange(being))
                     {
-                        player_node->stopAttack();
                         player_node->setGotoTarget(being);
-                        player_node->attack(being, true);
+                        player_node->attack(being, keyboard.isKeyActive(keyboard.KEY_TARGET));
                     }
                     else
                     {
                         player_node->setDestination(tilex, tiley);
-                        player_node->stopAttack();
                     }
                     break;
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index a16aa685..34a99bc9 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -273,7 +273,11 @@ void LocalPlayer::setTarget(Being *target)
     if (mLastAction != -1)
         return;
     mLastAction = tick_time;
-    mTargetTime = tick_time;
+
+    if (target)
+    {
+        mTargetTime = tick_time;
+    }
 
     if (target == mTarget)
     {
-- 
cgit v1.2.3-70-g09d2