Skip to content

bugfix(logic): Restore retail compatibility after change to frozen time check #2803

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

bugfix(logic): Restore retail compatibility after change to frozen time check #2803

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
9 changes: 1 addition & 8 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 @@ -749,20 +749,13 @@ void GameEngine::update()
}

const Bool canUpdate = canUpdateGameLogic(FramePacer::IgnoreFrozenTime | FramePacer::IgnoreHaltedGame);
const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();
const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();
const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted();

if (canUpdateLogic)
{
TheGameClient->step();
TheGameLogic->UPDATE();
}
else if (canUpdateScript)
{
// TheSuperHackers @info Still update the Script Engine to allow
// for scripted camera movements while the time is frozen.
TheScriptEngine->UPDATE();
}
}
}

Expand Down
6 changes: 6 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 @@ -3193,6 +3193,12 @@ void GameLogic::update()
TheScriptEngine->UPDATE();
}

// TheSuperHackers @info Update 'is time frozen' because it may have changed after the script engine update.
TheFramePacer->setTimeFrozen(TheGameEngine->isTimeFrozen());

if (TheFramePacer->isTimeFrozen())
return;

// Note - TerrainLogic update needs to happen after ScriptEngine update, but before object updates. jba.
// This way changes in bridges are noted in the script engine before being cleared in TerrainLogic->update
{
Expand Down
9 changes: 1 addition & 8 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 @@ -916,20 +916,13 @@ void GameEngine::update()
}

const Bool canUpdate = canUpdateGameLogic(FramePacer::IgnoreFrozenTime | FramePacer::IgnoreHaltedGame);
const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();
const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();
const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted();

if (canUpdateLogic)
{
TheGameClient->step();
TheGameLogic->UPDATE();
}
else if (canUpdateScript)
{
// TheSuperHackers @info Still update the Script Engine to allow
// for scripted camera movements while the time is frozen.
TheScriptEngine->UPDATE();
}
}
}

Expand Down
6 changes: 6 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 @@ -3732,6 +3732,12 @@ void GameLogic::update()
TheScriptEngine->UPDATE();
}

// TheSuperHackers @info Update 'is time frozen' because it may have changed after the script engine update.
TheFramePacer->setTimeFrozen(TheGameEngine->isTimeFrozen());

if (TheFramePacer->isTimeFrozen())
return;

// Note - TerrainLogic update needs to happen after ScriptEngine update, but before object updates. jba.
// This way changes in bridges are noted in the script engine before being cleared in TerrainLogic->update
{
Expand Down
Loading