Index: source/simulation2/Simulation2.cpp =================================================================== --- source/simulation2/Simulation2.cpp +++ source/simulation2/Simulation2.cpp @@ -532,7 +532,7 @@ CComponentManager& componentManager = simContext.GetComponentManager(); { - PROFILE2("Sim - Update Start"); + PROFILE3("Sim - Update Start"); CMessageTurnStart msgTurnStart; componentManager.BroadcastMessage(msgTurnStart); } @@ -559,7 +559,7 @@ // Send all the update phases { - PROFILE2("Sim - Update"); + PROFILE3("Sim - Update"); CMessageUpdate msgUpdate(turnLengthFixed); componentManager.BroadcastMessage(msgUpdate); } @@ -573,12 +573,12 @@ cmpPathfinder->ProcessSameTurnMoves(); { - PROFILE2("Sim - Motion Unit"); + PROFILE3("Sim - Motion Unit"); CMessageUpdate_MotionUnit msgUpdate(turnLengthFixed); componentManager.BroadcastMessage(msgUpdate); } { - PROFILE2("Sim - Update Final"); + PROFILE3("Sim - Update Final"); CMessageUpdate_Final msgUpdate(turnLengthFixed); componentManager.BroadcastMessage(msgUpdate); } @@ -606,7 +606,7 @@ void CSimulation2Impl::DumpState() { - PROFILE("DumpState"); + PROFILE3("DumpState"); std::stringstream name;\ name << std::setw(5) << std::setfill('0') << m_TurnNumber << ".txt"; Index: source/simulation2/components/CCmpPathfinder.cpp =================================================================== --- source/simulation2/components/CCmpPathfinder.cpp +++ source/simulation2/components/CCmpPathfinder.cpp @@ -732,7 +732,7 @@ void CCmpPathfinder::FinishAsyncRequests() { - PROFILE2("Finish Async Requests"); + PROFILE3("Finish Async Requests"); // Save the request queue in case it gets modified while iterating std::vector longRequests; m_LongPathRequests.swap(longRequests); @@ -751,7 +751,7 @@ void CCmpPathfinder::ProcessLongRequests(const std::vector& longRequests) { - PROFILE2("Process Long Requests"); + PROFILE3("Process Long Requests"); for (size_t i = 0; i < longRequests.size(); ++i) { const LongPathRequest& req = longRequests[i]; @@ -764,7 +764,7 @@ void CCmpPathfinder::ProcessShortRequests(const std::vector& shortRequests) { - PROFILE2("Process Short Requests"); + PROFILE3("Process Short Requests"); for (size_t i = 0; i < shortRequests.size(); ++i) { const ShortPathRequest& req = shortRequests[i]; Index: source/simulation2/helpers/HierarchicalPathfinder.cpp =================================================================== --- source/simulation2/helpers/HierarchicalPathfinder.cpp +++ source/simulation2/helpers/HierarchicalPathfinder.cpp @@ -361,7 +361,7 @@ const std::map& nonPathfindingPassClassMasks, const std::map& pathfindingPassClassMasks) { - PROFILE2("Hierarchical Recompute"); + PROFILE3("Hierarchical Recompute"); m_PassClassMasks = pathfindingPassClassMasks; @@ -590,7 +590,7 @@ void HierarchicalPathfinder::MakeGoalReachable(u16 i0, u16 j0, PathGoal& goal, pass_class_t passClass) const { - PROFILE2("MakeGoalReachable"); + PROFILE3("MakeGoalReachable"); RegionID source = Get(i0, j0, passClass); // Find everywhere that's reachable Index: source/simulation2/helpers/LongPathfinder.cpp =================================================================== --- source/simulation2/helpers/LongPathfinder.cpp +++ source/simulation2/helpers/LongPathfinder.cpp @@ -290,7 +290,7 @@ void reset(const Grid* terrain, pass_class_t passClass) { - PROFILE2("JumpPointCache reset"); + PROFILE3("JumpPointCache reset"); TIMER(L"JumpPointCache reset"); m_Width = terrain->m_W; Index: source/simulation2/helpers/VertexPathfinder.cpp =================================================================== --- source/simulation2/helpers/VertexPathfinder.cpp +++ source/simulation2/helpers/VertexPathfinder.cpp @@ -512,7 +512,7 @@ WaypointPath VertexPathfinder::ComputeShortPath(const ShortPathRequest& request, CmpPtr cmpObstructionManager) const { - PROFILE2("ComputeShortPath"); + PROFILE3("ComputeShortPath"); DebugRenderGoal(cmpObstructionManager->GetSimContext(), request.goal); Index: source/simulation2/system/ComponentManager.cpp =================================================================== --- source/simulation2/system/ComponentManager.cpp +++ source/simulation2/system/ComponentManager.cpp @@ -897,7 +897,7 @@ void CComponentManager::FlushDestroyedComponents() { - PROFILE2("Flush Destroyed Components"); + PROFILE3("Flush Destroyed Components"); while (!m_DestructionQueue.empty()) { // Make a copy of the destruction queue, so that the iterators won't be invalidated if the