Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit f809fe8

Browse files
committed
Fix a bug that could cause the GetHumanBrainCount or GetAIBrainCount to crash the game if called after the activity has ended cause brains are dead
1 parent 6995012 commit f809fe8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Entities/Activity.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,11 +836,11 @@ void Activity::Clear() {
836836

837837
for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
838838
if (getForHuman) {
839-
if (m_IsActive[player] && m_IsHuman[player] && m_HadBrain[player] && (g_MovableMan.IsActor(m_Brain[player]) || (m_Brain[player] && m_Brain[player]->HasObjectInGroup("Brains")))) {
839+
if (m_IsActive[player] && m_IsHuman[player] && m_HadBrain[player] && g_MovableMan.IsActor(m_Brain[player]) && m_Brain[player]->HasObjectInGroup("Brains")) {
840840
brainCount++;
841841
}
842842
} else {
843-
if (m_IsActive[player] && !m_IsHuman[player] && m_HadBrain[player] && (g_MovableMan.IsActor(m_Brain[player]) || (m_Brain[player] && m_Brain[player]->HasObjectInGroup("Brains")))) {
843+
if (m_IsActive[player] && !m_IsHuman[player] && m_HadBrain[player] && g_MovableMan.IsActor(m_Brain[player]) && m_Brain[player]->HasObjectInGroup("Brains")) {
844844
brainCount++;
845845
}
846846
}

0 commit comments

Comments
 (0)