From c8c1ddd927525ab3b1d71a7fb365cf8276b94b37 Mon Sep 17 00:00:00 2001
From: Torben Carrington <torbenlcarrington@Gmail.com>
Date: Fri, 24 May 2013 20:10:07 -0700
Subject: [PATCH] Adds functionality for checking if the animation group passed
 is currently playing on the actor passed. This is needed for AIWander.

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 ++
 apps/openmw/mwmechanics/actors.cpp              | 8 ++++++++
 apps/openmw/mwmechanics/actors.hpp              | 1 +
 apps/openmw/mwmechanics/character.cpp           | 8 ++++++++
 apps/openmw/mwmechanics/character.hpp           | 1 +
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 7 +++++++
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 1 +
 7 files changed, 28 insertions(+)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 38794269b..7e09f9b4d 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -112,6 +112,8 @@ namespace MWBase
         virtual void skipAnimation(const MWWorld::Ptr& ptr) = 0;
         ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
         /// references that are currently not in the scene should be ignored.
+
+        virtual bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) = 0;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 4db574cb8..00f2ac6fe 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -309,4 +309,12 @@ namespace MWMechanics
         if(iter != mActors.end())
             iter->second.skipAnim();
     }
+
+    bool Actors::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName)
+    {
+        PtrControllerMap::iterator iter = mActors.find(ptr);
+        if(iter != mActors.end())
+            return iter->second.isAnimPlaying(groupName);
+        return false;
+    }
 }
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index c01d63093..386840e3a 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -82,6 +82,7 @@ namespace MWMechanics
 
         void playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number);
         void skipAnimation(const MWWorld::Ptr& ptr);
+        bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 31ba83392..c7aeb1b5f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -509,6 +509,14 @@ void CharacterController::skipAnim()
     mSkipAnim = true;
 }
 
+bool CharacterController::isAnimPlaying(const std::string &groupName)
+{
+    if(mAnimation == NULL)
+        return false;
+    else
+        return mAnimation->isPlaying(groupName);
+}
+
 
 void CharacterController::clearAnimQueue()
 {
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 7ffefab47..7067176e0 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -125,6 +125,7 @@ public:
 
     void playGroup(const std::string &groupname, int mode, int count);
     void skipAnim();
+    bool isAnimPlaying(const std::string &groupName);
 
     void setState(CharacterState state);
     CharacterState getState() const
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index b83cfb365..29880291d 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -668,5 +668,12 @@ namespace MWMechanics
         else
             mObjects.skipAnimation(ptr);
     }
+    bool MechanicsManager::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string &groupName)
+    {
+        if(MWWorld::Class::get(ptr).isActor())
+            return mActors.checkAnimationPlaying(ptr, groupName);
+        else
+            return false;
+    }
 
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index f3a38bf36..95f760d11 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -100,6 +100,7 @@ namespace MWMechanics
 
         virtual void playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number);
         virtual void skipAnimation(const MWWorld::Ptr& ptr);
+        virtual bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string &groupName);
     };
 }