From 6c85d6763aec95b2f3367fea90437f4e818042e5 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 21 Apr 2013 18:38:25 -0700
Subject: [PATCH] Pass "loop stop" to the character controller

---
 apps/openmw/mwmechanics/character.cpp | 9 +++++++++
 apps/openmw/mwrender/animation.cpp    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 02a5aa100..16d811528 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -150,6 +150,15 @@ void CharacterController::updatePtr(const MWWorld::Ptr &ptr)
 
 void CharacterController::markerEvent(float time, const std::string &evt)
 {
+    if(evt == "loop stop")
+    {
+        if(mAnimQueue.size() >= 2 && mAnimQueue[0] == mAnimQueue[1])
+        {
+            mAnimQueue.pop_front();
+            mAnimation->play(mCurrentGroup, "loop start", "stop", false);
+        }
+        return;
+    }
     if(evt == "stop")
     {
         if(mAnimQueue.size() >= 2 && mAnimQueue[0] == mAnimQueue[1])
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index ea27cbb5e..68fae99dd 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -409,10 +409,10 @@ bool Animation::handleEvent(float time, const std::string &evt)
             reset("loop start");
             if(mCurrentTime >= time)
                 return false;
+            return true;
         }
-        return true;
     }
-    if(evt == "stop")
+    else if(evt == "stop")
     {
         if(mLooping)
         {