From 23ffb8a4dc0f393f01272a97255606353ebe683f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 28 Jan 2014 20:57:37 +0100
Subject: [PATCH] Fixes #1143: Make getCurrentAiPackage return the package that
 was run last, not the package that will be run in the next frame.

This makes the Mehra Milo script work properly.
---
 apps/openmw/mwmechanics/aisequence.cpp | 5 ++++-
 apps/openmw/mwmechanics/aisequence.hpp | 7 +++++++
 apps/openmw/mwscript/aiextensions.cpp  | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 989d9c6a2..2110393fd 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -23,7 +23,7 @@ void MWMechanics::AiSequence::copy (const AiSequence& sequence)
         mPackages.push_back ((*iter)->clone());
 }
 
-MWMechanics::AiSequence::AiSequence() : mDone (false) {}
+MWMechanics::AiSequence::AiSequence() : mDone (false), mLastAiPackage(-1) {}
 
 MWMechanics::AiSequence::AiSequence (const AiSequence& sequence) : mDone (false)
 {
@@ -84,6 +84,7 @@ void MWMechanics::AiSequence::execute (const MWWorld::Ptr& actor,float duration)
     {
         if (!mPackages.empty())
         {
+            mLastAiPackage = mPackages.front()->getTypeId();
             if (mPackages.front()->execute (actor,duration))
             {
                 delete *mPackages.begin();
@@ -91,7 +92,9 @@ void MWMechanics::AiSequence::execute (const MWWorld::Ptr& actor,float duration)
                 mDone = true;
             }
             else
+            {
                 mDone = false;    
+            }
         }
     }
 }
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 351e04480..62f48f981 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -23,6 +23,9 @@ namespace MWMechanics
 
             void copy (const AiSequence& sequence);
 
+            // The type of AI package that ran last
+            int mLastAiPackage;
+
         public:
         
             AiSequence();
@@ -36,6 +39,10 @@ namespace MWMechanics
             int getTypeId() const;
             ///< @see enum AiPackage::TypeId
 
+            int getLastRunTypeId() const { return mLastAiPackage; }
+            ///< Get the typeid of the Ai package that ran last, NOT the currently "active" Ai package that will be run in the next frame.
+            /// This difference is important when an Ai package has just finished and been removed.
+
             bool getCombatTarget (std::string &targetActorId) const;
             ///< Return true and assign target if combat package is currently
             /// active, return false otherwise
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 05886c51c..8314d011a 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -352,7 +352,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().getTypeId ();
+                    Interpreter::Type_Integer value = MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().getLastRunTypeId();
 
                     runtime.push (value);
                 }