From bfff84ba8f76aed1f511870e76a0cc3dda631f46 Mon Sep 17 00:00:00 2001
From: dteviot <dteviot@gmail.co.nz>
Date: Sun, 14 Jun 2015 10:30:55 +1200
Subject: [PATCH 1/2] replaced #include with forward class declaration, as
 suggested by slaugherfish.

---
 apps/openmw/mwmechanics/aipackage.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 0370072a41..78a2bfd9f7 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -4,8 +4,6 @@
 #include "pathfinding.hpp"
 #include <components/esm/defs.hpp>
 
-#include "../mwworld/cellstore.hpp"
-
 #include "obstacle.hpp"
 #include "aistate.hpp"
 
@@ -16,6 +14,7 @@ namespace MWWorld
 
 namespace ESM
 {
+    struct Cell;
     namespace AiSequence
     {
         struct AiSequence;

From 520fbd63c4a50a56b79a49bd90b8da6f10c2e26a Mon Sep 17 00:00:00 2001
From: dteviot <dteviot@gmail.co.nz>
Date: Sun, 14 Jun 2015 15:14:02 +1200
Subject: [PATCH 2/2] simplified pathfinding code.

remove mIsPathConstructed.  Instead call !mPath.empty().
---
 apps/openmw/mwmechanics/pathfinding.cpp | 17 ++---------------
 apps/openmw/mwmechanics/pathfinding.hpp |  4 +---
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 980de1badd..fea993e231 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -114,8 +114,7 @@ namespace MWMechanics
     }
 
     PathFinder::PathFinder()
-        : mIsPathConstructed(false),
-          mPathgrid(NULL),
+        : mPathgrid(NULL),
           mCell(NULL)
     {
     }
@@ -124,7 +123,6 @@ namespace MWMechanics
     {
         if(!mPath.empty())
             mPath.clear();
-        mIsPathConstructed = false;
     }
 
     /*
@@ -180,7 +178,6 @@ namespace MWMechanics
                 static_cast<float>(endPoint.mX), static_cast<float>(endPoint.mY), static_cast<float>(endPoint.mZ)))
             {
                 mPath.push_back(endPoint);
-                mIsPathConstructed = true;
                 return;
             }
         }
@@ -197,7 +194,6 @@ namespace MWMechanics
         if(!mPathgrid || mPathgrid->mPoints.empty())
         {
             mPath.push_back(endPoint);
-            mIsPathConstructed = true;
             return;
         }
 
@@ -235,7 +231,6 @@ namespace MWMechanics
                 if(startNode == endNode.first)
                 {
                     mPath.push_back(endPoint);
-                    mIsPathConstructed = true;
                     return;
                 }
 
@@ -243,7 +238,6 @@ namespace MWMechanics
 
                 if(!mPath.empty())
                 {
-                    mIsPathConstructed = true;
                     // Add the destination (which may be different to the closest
                     // pathgrid point).  However only add if endNode was the closest
                     // point to endPoint.
@@ -256,14 +250,8 @@ namespace MWMechanics
                     if(endNode.second)
                         mPath.push_back(endPoint);
                 }
-                else
-                    mIsPathConstructed = false;
             }
-            else
-                mIsPathConstructed = false;
         }
-        else
-            mIsPathConstructed = false;
 
         return;
     }
@@ -271,7 +259,7 @@ namespace MWMechanics
     float PathFinder::getZAngleToNext(float x, float y) const
     {
         // This should never happen (programmers should have an if statement checking
-        // mIsPathConstructed that prevents this call if otherwise).
+        // isPathConstructed that prevents this call if otherwise).
         if(mPath.empty())
             return 0.;
 
@@ -293,7 +281,6 @@ namespace MWMechanics
             mPath.pop_front();
             if(mPath.empty())
             {
-                mIsPathConstructed = false;
                 return true;
             }
         }
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 0f52a6e19d..644d792368 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -48,7 +48,7 @@ namespace MWMechanics
 
             bool isPathConstructed() const
             {
-                return mIsPathConstructed;
+                return !mPath.empty();
             }
 
             int getPathSize() const
@@ -96,8 +96,6 @@ namespace MWMechanics
 
         private:
 
-            bool mIsPathConstructed;
-
             std::list<ESM::Pathgrid::Point> mPath;
 
             const ESM::Pathgrid *mPathgrid;