Drop path points while tolerance allows

6 years ago · ea80a81538
parent b9f21ec81a
commit ea80a81538
1 changed files with 3 additions and 2 deletions
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@ -262,9 +262,10 @@ namespace MWMechanics
        if (mPath.empty())
            return;

-        const auto tolerance = mPath.size() > 1 ? pointTolerance : destinationTolerance;
+        while (mPath.size() > 1 && sqrDistanceIgnoreZ(mPath.front(), position) < pointTolerance * pointTolerance)
+            mPath.pop_front();

-        if (sqrDistanceIgnoreZ(mPath.front(), position) < tolerance * tolerance)
+        if (mPath.size() == 1 && sqrDistanceIgnoreZ(mPath.front(), position) < destinationTolerance * destinationTolerance)
            mPath.pop_front();
    }