From cbcf0f60399e5ca59513a8dcf189c3af040c7b45 Mon Sep 17 00:00:00 2001
From: Thomas <tluppi@thomas-GE60.(none)>
Date: Wed, 14 May 2014 01:44:11 -0400
Subject: [PATCH] Changed AiEScort to use new PathTo function

---
 apps/openmw/mwmechanics/aiescort.cpp  | 57 +--------------------------
 apps/openmw/mwmechanics/aipackage.cpp |  6 ++-
 apps/openmw/mwmechanics/aipackage.hpp |  1 +
 components/esm/loadpgrd.hpp           |  1 +
 4 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index f27fada39..0430adf06 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -75,58 +75,6 @@ namespace MWMechanics
                 return true;
         }
 
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        ESM::Position pos = actor.getRefData().getPosition();
-        bool cellChange = actor.getCell()->getCell()->mData.mX != mCellX || actor.getCell()->getCell()->mData.mY != mCellY;
-
-        if(actor.getCell()->getCell()->mData.mX != player.getCell()->getCell()->mData.mX)
-        {
-            int sideX = PathFinder::sgn(actor.getCell()->getCell()->mData.mX - player.getCell()->getCell()->mData.mX);
-            // Check if actor is near the border of an inactive cell. If so, pause walking.
-            if(sideX * (pos.pos[0] - actor.getCell()->getCell()->mData.mX * ESM::Land::REAL_SIZE) > sideX * (ESM::Land::REAL_SIZE /
-                2.0 - 200))
-            {
-                MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
-                return false;
-            }
-        }
-        if(actor.getCell()->getCell()->mData.mY != player.getCell()->getCell()->mData.mY)
-        {
-            int sideY = PathFinder::sgn(actor.getCell()->getCell()->mData.mY - player.getCell()->getCell()->mData.mY);
-            // Check if actor is near the border of an inactive cell. If so, pause walking.
-            if(sideY*(pos.pos[1] - actor.getCell()->getCell()->mData.mY * ESM::Land::REAL_SIZE) > sideY * (ESM::Land::REAL_SIZE /
-                2.0 - 200))
-            {
-                MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
-                return false;
-            }
-        }
-
-
-        if(!mPathFinder.isPathConstructed() || cellChange)
-        {
-            mCellX = actor.getCell()->getCell()->mData.mX;
-            mCellY = actor.getCell()->getCell()->mData.mY;
-
-            ESM::Pathgrid::Point dest;
-            dest.mX = mX;
-            dest.mY = mY;
-            dest.mZ = mZ;
-
-            ESM::Pathgrid::Point start;
-            start.mX = pos.pos[0];
-            start.mY = pos.pos[1];
-            start.mZ = pos.pos[2];
-
-            mPathFinder.buildPath(start, dest, actor.getCell(), true);
-        }
-
-        if(mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]))
-        {
-            MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
-            return true;
-        }
-
         const MWWorld::Ptr follower = MWBase::Environment::get().getWorld()->getPtr(mActorId, false);
         const float* const leaderPos = actor.getRefData().getPosition().pos;
         const float* const followerPos = follower.getRefData().getPosition().pos;
@@ -141,9 +89,8 @@ namespace MWMechanics
 
         if(distanceBetweenResult <= mMaxDist * mMaxDist)
         {
-            float zAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
-            zTurn(actor, Ogre::Degree(zAngle));
-            MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 1;
+            if(pathTo(actor,ESM::Pathgrid::Point(mX,mY,mZ),duration)) //Returns true on path complete
+                return true;
             mMaxDist = 470;
         }
         else
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index c2e8385b8..5e16ebdc8 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -69,7 +69,11 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Po
     //***********************
     if(mTimer > 0.25)
     {
-        mPathFinder.buildPath(start, dest, actor.getCell(), true); //Rebuild path, in case the target has moved
+        if(distance(mPrevDest, dest) > 10) { //Only rebuild path if it's moved
+            mPathFinder.buildPath(start, dest, actor.getCell(), true); //Rebuild path, in case the target has moved
+            mPrevDest = dest;
+        }
+
         if(!mPathFinder.getPath().empty()) //Path has points in it
         {
             ESM::Pathgrid::Point lastPos = mPathFinder.getPath().back(); //Get the end of the proposed path
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index bb62a2543..055958384 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -67,6 +67,7 @@ namespace MWMechanics
             MWWorld::Ptr mLastDoorChecked; //Used to ensure we don't try to CONSTANTLY open a door
 
             ESM::Position mStuckPos;
+            ESM::Pathgrid::Point mPrevDest;
     };
 }
 
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index 926233444..60a736991 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -34,6 +34,7 @@ struct Pathgrid
         Point& operator=(const float[3]);
         Point(const float[3]);
         Point();
+        Point(int x, int y, int z) : mX(x), mY(y), mZ(z) {}
     }; // 16 bytes
 
     struct Edge // path grid edge