*Merge.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index 47be039d415..e78de5571bc 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -247,17 +247,23 @@ MapManager::Update(time_t diff)
     if( !i_timer.Passed() )
         return;
 
+    sWorld.RecordTimeDiff(NULL);
     ObjectAccessor::Instance().UpdatePlayers(i_timer.GetCurrent());
+    sWorld.RecordTimeDiff("UpdatePlayers");
+
 
     for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
     {
         checkAndCorrectGridStatesArray();                   // debugging code, should be deleted some day
         iter->second->Update(i_timer.GetCurrent());
+        sWorld.RecordTimeDiff("UpdateMap %u", iter->second->GetId());
     }
 
     ObjectAccessor::Instance().Update(i_timer.GetCurrent());
+    sWorld.RecordTimeDiff("UpdateObjectAccessor");
     for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
         (*iter)->Update(i_timer.GetCurrent());
+    sWorld.RecordTimeDiff("UpdateTransports");
 
     i_timer.SetCurrent(0);
 }