From 4d9100091d3356dfadef0b55e83970da689ba406 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 6 Jan 2015 22:19:04 +0100
Subject: [PATCH] Reduce default pathing arrival tolerance to 32 units (Fixes
 #1605)

---
 apps/openmw/mwmechanics/aiwander.cpp    | 2 +-
 apps/openmw/mwmechanics/pathfinding.cpp | 4 ++--
 apps/openmw/mwmechanics/pathfinding.hpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 2df3762ab5..94c4542f81 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -202,7 +202,7 @@ namespace MWMechanics
         // Are we there yet?
         bool& chooseAction = storage.mChooseAction;
         if(walking &&
-           storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2]))
+           storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2], 64.f))
         {
             stopWalking(actor, storage);
             moveNow = false;
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index f1279c415e..f59167df7a 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -297,13 +297,13 @@ namespace MWMechanics
         return false;
     }
 
-    bool PathFinder::checkPathCompleted(float x, float y, float z)
+    bool PathFinder::checkPathCompleted(float x, float y, float z, float tolerance)
     {
         if(mPath.empty())
             return true;
 
         ESM::Pathgrid::Point nextPoint = *mPath.begin();
-        if(sqrDistanceZCorrected(nextPoint, x, y, z) < 64*64)
+        if(sqrDistanceZCorrected(nextPoint, x, y, z) < tolerance*tolerance)
         {
             mPath.pop_front();
             if(mPath.empty())
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 482808dacd..61008577c9 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -39,8 +39,8 @@ namespace MWMechanics
             void buildPath(const ESM::Pathgrid::Point &startPoint, const ESM::Pathgrid::Point &endPoint,
                            const MWWorld::CellStore* cell, bool allowShortcuts = true);
 
-            bool checkPathCompleted(float x, float y, float z);
-            ///< \Returns true if the last point of the path has been reached.
+            bool checkPathCompleted(float x, float y, float z, float tolerance=32.f);
+            ///< \Returns true if we are within \a tolerance units of the last path point.
 
             bool checkWaypoint(float x, float y, float z);
             ///< \Returns true if a way point was reached