Cancel walking to a clicked monster if the target is lost while getting to it (killed or otherwise removed).

2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 96be82e7..cb28b5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* src/gui/browserbox.cpp: Fix a basic_string::at sometimes being out
 	of range in BrowserBox::draw when checking for line separators and
 	color codes.
+	* src/localplayer.cpp: Cancel walking to a clicked monster if the
+	target is lost while getting to it (killed or otherwise removed).
 
 2008-04-16  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 2aae199e..20f6b6a7 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -116,6 +116,11 @@ void LocalPlayer::nextStep()
         mPath.clear();
         return;
     }
+    else if (mGoingToTarget && !mTarget)
+    {
+        mGoingToTarget = false;
+        mPath.clear();
+    }
 
     Player::nextStep();
 }