From af65ecd8415b3504c26b8d9fdb8d713bfef2fa89 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 30 Mar 2013 18:37:40 -0700
Subject: [PATCH] Pass the movement vector in as a parameter to
 CharacterController::update

---
 apps/openmw/mwmechanics/activators.cpp | 5 ++++-
 apps/openmw/mwmechanics/actors.cpp     | 3 ++-
 apps/openmw/mwmechanics/character.cpp  | 6 +-----
 apps/openmw/mwmechanics/character.hpp  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/activators.cpp b/apps/openmw/mwmechanics/activators.cpp
index b67fcb216..51fa55f4e 100644
--- a/apps/openmw/mwmechanics/activators.cpp
+++ b/apps/openmw/mwmechanics/activators.cpp
@@ -56,7 +56,10 @@ void Activators::update(float duration, bool paused)
     if(!paused)
     {
         for(PtrControllerMap::iterator iter(mActivators.begin());iter != mActivators.end();++iter)
-            iter->second.update(duration);
+        {
+            Ogre::Vector3 movement(0.0f);
+            iter->second.update(duration, movement);
+        }
     }
 }
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 1480b3182..a7615311b 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -266,7 +266,8 @@ namespace MWMechanics
 
             for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
             {
-                Ogre::Vector3 movement = iter->second.update(duration);
+                Ogre::Vector3 movement(0.0f);
+                iter->second.update(duration, movement);
                 mMovement.push_back(std::make_pair(iter->first, movement));
             }
             MWBase::Environment::get().getWorld()->doPhysics(mMovement, duration);
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 62958db8d..5e112d54e 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -168,10 +168,8 @@ void CharacterController::markerEvent(float time, const std::string &evt)
 }
 
 
-Ogre::Vector3 CharacterController::update(float duration)
+void CharacterController::update(float duration, Ogre::Vector3 &movement)
 {
-    Ogre::Vector3 movement(0.0f);
-
     float speed = 0.0f;
     if(!(getState() >= CharState_Death1))
     {
@@ -240,8 +238,6 @@ Ogre::Vector3 CharacterController::update(float duration)
         movement += mAnimation->runAnimation(duration);
     }
     mSkipAnim = false;
-
-    return movement;
 }
 
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 46f0690e7..8cba49b5f 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -87,7 +87,7 @@ public:
 
     void updatePtr(const MWWorld::Ptr &ptr);
 
-    Ogre::Vector3 update(float duration);
+    void update(float duration, Ogre::Vector3 &movement);
 
     void playGroup(const std::string &groupname, int mode, int count);
     void skipAnim();