From d050c3377dd128947a0b21bd1641bee637e95de8 Mon Sep 17 00:00:00 2001 From: wraitii Date: Fri, 26 Mar 2021 16:49:59 +0000 Subject: [PATCH] Fix unit overlapping following bae258f9a1 Following bae258f9a1, all units moved, then all messages were sent. This could result in units overlapping, which cannot be resolved without unit pushing. Fixing this makes for a fairer comparison with the pushing diff, so it seems worthwhile. Differential Revision: https://code.wildfiregames.com/D3746 This was SVN commit r25126. --- source/simulation2/components/CCmpUnitMotion_System.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/simulation2/components/CCmpUnitMotion_System.cpp b/source/simulation2/components/CCmpUnitMotion_System.cpp index 19c564e518..db3a829f5a 100644 --- a/source/simulation2/components/CCmpUnitMotion_System.cpp +++ b/source/simulation2/components/CCmpUnitMotion_System.cpp @@ -94,8 +94,8 @@ void CCmpUnitMotionManager::Move(EntityMap& ents, fixed dt) } for (EntityMap::iterator& it : m_MovingUnits) + { it->second.cmpUnitMotion->Move(it->second, dt); - - for (EntityMap::iterator& it : m_MovingUnits) it->second.cmpUnitMotion->PostMove(it->second, dt); + } }