From 5ee298cdc14c0f653c377fa4c676a2487e877d54 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 4 Feb 2013 14:08:38 -0800
Subject: [PATCH] Make sure the player updates last

---
 apps/openmw/mwmechanics/actors.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c1f552ae4..e829d4679 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -258,14 +258,19 @@ namespace MWMechanics
 
         if(!paused)
         {
-            std::vector<std::pair<std::string, Ogre::Vector3> > movement;
+            PtrControllerMap::iterator player(mActors.end());
             for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
             {
-                Ogre::Vector3 vector = iter->second.update(duration);
-                if(vector!=Ogre::Vector3::ZERO)
-                    movement.push_back(std::make_pair(iter->first.getRefData().getHandle(), vector));
+                if(iter->first.getRefData().getHandle() == "player")
+                {
+                    /* Make sure player updates last (in case a cell transition occurs) */
+                    player = iter;
+                    continue;
+                }
+                iter->second.update(duration);
             }
-            MWBase::Environment::get().getWorld()->doPhysics (movement, duration);
+            if(player != mActors.end())
+                player->second.update(duration);
         }
     }