From a17252eab3415d2b1d987ccc8c3a3ef3c1481b32 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 6 Jan 2015 23:23:58 +0100
Subject: [PATCH] Remove unused checkWaypoint function

It was an almost exact copy of the checkPathCompleted function anyway.
---
 apps/openmw/mwmechanics/aicombat.cpp    |  2 +-
 apps/openmw/mwmechanics/pathfinding.cpp | 15 ---------------
 apps/openmw/mwmechanics/pathfinding.hpp |  3 ---
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index a23634ea39..5d04705544 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -580,7 +580,7 @@ namespace MWMechanics
                 buildNewPath(actor, target); //may fail to build a path, check before use
 
                 //delete visited path node
-                mPathFinder.checkWaypoint(pos.pos[0],pos.pos[1],pos.pos[2]);
+                mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]);
 
                 // This works on the borders between the path grid and areas with no waypoints.
                 if(inLOS && mPathFinder.getPath().size() > 1)
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index f59167df7a..0634725a81 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -282,21 +282,6 @@ namespace MWMechanics
         return Ogre::Math::ATan2(directionX,directionY).valueDegrees();
     }
 
-    bool PathFinder::checkWaypoint(float x, float y, float z)
-    {
-        if(mPath.empty())
-            return true;
-
-        ESM::Pathgrid::Point nextPoint = *mPath.begin();
-        if(sqrDistanceZCorrected(nextPoint, x, y, z) < 64*64)
-        {
-            mPath.pop_front();
-            if(mPath.empty()) mIsPathConstructed = false;
-            return true;
-        }
-        return false;
-    }
-
     bool PathFinder::checkPathCompleted(float x, float y, float z, float tolerance)
     {
         if(mPath.empty())
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 61008577c9..7ba2d22ba6 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -42,9 +42,6 @@ namespace MWMechanics
             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
-
             float getZAngleToNext(float x, float y) const;
 
             bool isPathConstructed() const