From d2aada95b44785ee41092ec37a0e4a2d8ddaeb17 Mon Sep 17 00:00:00 2001
From: Thomas <tluppi@thomas-GE60.(none)>
Date: Wed, 14 May 2014 14:11:34 -0400
Subject: [PATCH] Fixed AiPursue by fixing underlying issue is Pathto()

---
 apps/openmw/mwmechanics/aiactivate.cpp  | 1 -
 apps/openmw/mwmechanics/aiavoiddoor.cpp | 2 +-
 apps/openmw/mwmechanics/aifollow.cpp    | 7 +++----
 apps/openmw/mwmechanics/aipackage.cpp   | 3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 56c155ded..4b4b36ed6 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -37,7 +37,6 @@ bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor,float duration)
     }
     else {
         pathTo(actor, dest, duration); //Go to the destination
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
     }
 
     return false;
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 26865aea4..a206d27ca 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -22,7 +22,7 @@ bool MWMechanics::AiAvoidDoor::execute (const MWWorld::Ptr& actor,float duration
 {
 
     ESM::Position pos = actor.getRefData().getPosition();
-    if(mDuration = 1) //If it just started, get the actor position as the stuck detection thing
+    if(mDuration == 1) //If it just started, get the actor position as the stuck detection thing
         mLastPos = pos;
 
     mDuration -= duration; //Update timer
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 8d9e01939..f1296a949 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -58,12 +58,11 @@ bool MWMechanics::AiFollow::execute (const MWWorld::Ptr& actor,float duration)
     //Set the target desition from the actor
     ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
 
-    pathTo(actor, dest, duration); //Go to the destination
-
     if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 100) //Stop when you get close
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-    else
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
+    else {
+        pathTo(actor, dest, duration); //Go to the destination
+    }
 
     //Check if you're far away
     if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) > 1000)
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 5e16ebdc8..2a2f4fdc8 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -16,7 +16,7 @@
 
 MWMechanics::AiPackage::~AiPackage() {}
 
-MWMechanics::AiPackage::AiPackage() : mLastDoorChecked(MWWorld::Ptr()), mTimer(0), mStuckTimer(0) {
+MWMechanics::AiPackage::AiPackage() : mLastDoorChecked(MWWorld::Ptr()), mTimer(.26), mStuckTimer(0) { //mTimer starts at .26 to force initial pathbuild
 
 }
 
@@ -118,6 +118,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Po
             mStuckTimer = 0;
             mStuckPos = pos;
             mLastDoorChecked = MWWorld::Ptr(); //Resets it, in case he gets stuck behind the door again
+            actor.getClass().getMovementSettings(actor).mPosition[1] = 1; //Just run forward
         }
     }
     else {