From 40f8e757637927d631ff97aa4a14d0b7c911bddf Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 18 Jan 2013 15:39:28 -0800
Subject: [PATCH] Use a SpecialIdle state for PlayGroup/LoopGroup invoked
 animations

Note that actors will *not* automatically resume a normal idle state afterward.
Their AI will need to control what to do when the special idle is finished.
---
 apps/openmw/mwmechanics/character.cpp | 3 +++
 apps/openmw/mwmechanics/character.hpp | 1 +
 2 files changed, 4 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 97cdf3f492..73a6f2c9c7 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -138,6 +138,7 @@ void CharacterController::playGroup(const std::string &groupname, int mode, int
             while(count-- > 0)
                 mAnimQueue.push_back(groupname);
             mCurrentGroup = groupname;
+            mState = CharState_SpecialIdle;
             mAnimation->setAccumulation(Ogre::Vector3::ZERO);
             mAnimation->play(mCurrentGroup, ((mode==2) ? "loop start" : "start"));
         }
@@ -165,6 +166,8 @@ void CharacterController::setState(CharacterState state)
     mAnimQueue.clear();
     switch(mState)
     {
+        case CharState_SpecialIdle:
+            break;
         case CharState_Idle:
             mCurrentGroup = "idle";
             mAnimation->setAccumulation(Ogre::Vector3::ZERO);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 902b8cc36b..47bb27e837 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -12,6 +12,7 @@ namespace MWMechanics
 {
 
 enum CharacterState {
+    CharState_SpecialIdle, /* When running a PlayGroup/LoopGroup animation. */
     CharState_Idle,
     CharState_Dead
 };