Fixed issue where movepath is updated too early, causing crashes

cortex-command-community · Dec 29, 2023 · 0c5aaf5 · 0c5aaf5
1 parent 2d7ddfd
commit 0c5aaf5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Entities/Actor.cpp b/Entities/Actor.cpp
@@ -287,10 +287,7 @@ int Actor::Create(const Actor &reference)
     m_pMOMoveTarget = reference.m_pMOMoveTarget;
     m_PrevPathTarget = reference.m_PrevPathTarget;
     m_MoveVector = reference.m_MoveVector;
-	if (!m_Waypoints.empty()) {
-		UpdateMovePath();
-	}
-//    m_MovePath.clear(); will recalc on its own
+    m_MovePath.clear();
     m_UpdateMovePath = reference.m_UpdateMovePath;
     m_MoveProximityLimit = reference.m_MoveProximityLimit;
     m_AIBaseDigStrength = reference.m_AIBaseDigStrength;

diff --git a/Managers/SceneMan.cpp b/Managers/SceneMan.cpp
@@ -139,8 +139,6 @@ int SceneMan::LoadScene(Scene *pNewScene, bool placeObjects, bool placeUnits) {
 	g_PostProcessMan.ClearScenePostEffects();
 
 	if (m_pCurrentScene) {
-        // Ensure all async pathing requests are complete
-        m_pCurrentScene->BlockUntilAllPathingRequestsComplete();
 		delete m_pCurrentScene;
 		m_pCurrentScene = nullptr;
 	}