From d77d035d3a32fe7eefd567068572c805a17a5e97 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 23 Feb 2013 14:15:11 -0800
Subject: [PATCH] Handle the "sound" events in runAnimation

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

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 5598e0e56..37477932a 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -24,7 +24,6 @@
 #include "../mwrender/animation.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
@@ -134,19 +133,6 @@ CharacterController::~CharacterController()
 
 void CharacterController::markerEvent(float time, const std::string &evt)
 {
-    if(evt.compare(0, 7, "sound: ") == 0)
-    {
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
-        return;
-    }
-    if(evt.compare(0, 10, "soundgen: ") == 0)
-    {
-        // FIXME: Lookup the SoundGen (SNDG) for the specified sound that corresponds
-        // to this actor type
-        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 39323edac..f453e6a74 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -8,6 +8,7 @@
 #include <OgreSceneManager.h>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwmechanics/character.hpp"
@@ -406,6 +407,20 @@ Ogre::Vector3 Animation::runAnimation(float timepassed)
             /* Do nothing */
             continue;
         }
+
+        if(evt.compare(0, 7, "sound: ") == 0)
+        {
+            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+            sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
+            continue;
+        }
+        if(evt.compare(0, 10, "soundgen: ") == 0)
+        {
+            // FIXME: Lookup the SoundGen (SNDG) for the specified sound that corresponds
+            // to this actor type
+            continue;
+        }
+
         if(evt == "loop stop")
         {
             if(mLooping)