Skip to content

Fix: Correctly restore ScriptEngine's condition team #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Correctly restore ScriptEngine's condition team #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5334,7 +5334,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)


Player *savPlayer = m_currentPlayer;
// Team *pSavConditionTeam = m_conditionTeam;
Team *pSavConditionTeam = m_conditionTeam;
LatchRestore<Team *> latch(m_callingTeam, pThisTeam);

m_conditionTeam = nullptr;
Expand Down Expand Up @@ -5371,7 +5371,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)
}
}
// m_callingTeam is restored automatically via LatchRestore
m_conditionTeam = m_conditionTeam;
m_conditionTeam = pSavConditionTeam;
m_currentPlayer = savPlayer;
}

Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6071,7 +6071,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team* pThisTeam)


Player* savPlayer = m_currentPlayer;
// Team *pSavConditionTeam = m_conditionTeam;
Team* pSavConditionTeam = m_conditionTeam;
LatchRestore<Team*> latch(m_callingTeam, pThisTeam);

m_conditionTeam = NULL;
Expand Down Expand Up @@ -6112,7 +6112,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team* pThisTeam)
}
}
// m_callingTeam is restored automatically via LatchRestore
m_conditionTeam = m_conditionTeam;
m_conditionTeam = pSavConditionTeam;
m_currentPlayer = savPlayer;
}

Expand Down
Loading