Merge branch 'pathfinding-nav-optimizations' of https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source into pathfinding-nav-optimizations

Causeless · Causeless · commit 45ae3714aaaf · 2023-11-13T17:15:17.000Z
diff --git a/Activities/GameActivity.cpp b/Activities/GameActivity.cpp
@@ -1347,7 +1347,7 @@ void GameActivity::Update()
         // Assure that Controlled Actor is a safe pointer
 
         // Only allow this if player's brain is intact
-        if (g_MovableMan.IsActor(m_Brain[player]))
+        if (m_Brain[player] && !m_Brain[player]->IsDead() )
         {
             // Note that we have now had a brain
             m_HadBrain[player] = true;

Original file line number	Diff line number	Diff line change
`@@ -1347,7 +1347,7 @@ void GameActivity::Update()`
`1347`	`1347`	`// Assure that Controlled Actor is a safe pointer`
`1348`	`1348`
`1349`	`1349`	`// Only allow this if player's brain is intact`
`1350`		`- if (g_MovableMan.IsActor(m_Brain[player]))`
	`1350`	`+ if (m_Brain[player] && !m_Brain[player]->IsDead() )`
`1351`	`1351`	`{`
`1352`	`1352`	`// Note that we have now had a brain`
`1353`	`1353`	`m_HadBrain[player] = true;`