Skip to content

fix(headless): Skip early load abort in headless replay simulations #2730

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
githubawn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(headless): Skip early load abort in headless replay simulations #2730

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
1 change: 0 additions & 1 deletion Generals/Code/GameEngine/Include/Common/GameEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ class GameEngine : public SubsystemInterface
Bool m_isActive; ///< app has OS focus.
};

inline void GameEngine::setQuitting( Bool quitting ) { m_quitting = quitting; }
inline Bool GameEngine::getQuitting() { return m_quitting; }

// the game engine singleton
Expand Down
9 changes: 9 additions & 0 deletions Generals/Code/GameEngine/Source/Common/GameEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,15 @@ GameEngine::~GameEngine()
#endif
}

void GameEngine::setQuitting( Bool quitting )
{
if (quitting && TheGlobalData && TheGlobalData->m_headless)
{
return;
}
m_quitting = quitting;
}

//-------------------------------------------------------------------------------------------------
Bool GameEngine::isTimeFrozen()
{
Expand Down
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3712,6 +3712,11 @@ void GameLogic::exitGame()

void GameLogic::quit(Bool toDesktop)
{
if (TheGlobalData && TheGlobalData->m_headless)
{
return;
}

const Bool isNotLoading = (!isLoadingMap() && !isLoadingSave());

if (isInGame())
Expand Down
1 change: 0 additions & 1 deletion GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ class GameEngine : public SubsystemInterface
Bool m_isActive; ///< app has OS focus.
};

inline void GameEngine::setQuitting( Bool quitting ) { m_quitting = quitting; }
inline Bool GameEngine::getQuitting() { return m_quitting; }

// the game engine singleton
Expand Down
9 changes: 9 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,15 @@ GameEngine::~GameEngine()
#endif
}

void GameEngine::setQuitting( Bool quitting )
{
if (quitting && TheGlobalData && TheGlobalData->m_headless)
{
return;
}
m_quitting = quitting;
}

//-------------------------------------------------------------------------------------------------
Bool GameEngine::isTimeFrozen()
{
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4272,6 +4272,11 @@ void GameLogic::exitGame()

void GameLogic::quit(Bool toDesktop)
{
if (TheGlobalData && TheGlobalData->m_headless)
{
return;
}

const Bool isNotLoading = (!isLoadingMap() && !isLoadingSave());

if (isInGame())
Expand Down
Loading