bugfix(gameengine): Fix logic in GameEngine::canUpdateRegularGameLogic() (TheSuperHackers#2707)

xezon · web-flow · commit bf8d5be0294f · 2026-05-21T21:13:20.000+02:00
diff --git a/Generals/Code/GameEngine/Include/Common/GameEngine.h b/Generals/Code/GameEngine/Include/Common/GameEngine.h
@@ -80,9 +80,9 @@ class GameEngine : public SubsystemInterface
 
 	virtual void resetSubsystems();
 
-	Bool canUpdateGameLogic();
+	Bool canUpdateGameLogic(UnsignedInt logicTimeQueryFlags);
 	Bool canUpdateNetworkGameLogic();
-	Bool canUpdateRegularGameLogic();
+	Bool canUpdateRegularGameLogic(UnsignedInt logicTimeQueryFlags);
 
 	virtual FileSystem *createFileSystem();								///< Factory for FileSystem classes
 	virtual LocalFileSystem *createLocalFileSystem() = 0;	///< Factory for LocalFileSystem classes
diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -649,7 +649,7 @@ void GameEngine::resetSubsystems()
 }
 
 /// -----------------------------------------------------------------------------------------------
-Bool GameEngine::canUpdateGameLogic()
+Bool GameEngine::canUpdateGameLogic(UnsignedInt logicTimeQueryFlags)
 {
 	// Must be first.
 	TheGameLogic->preUpdate();
@@ -663,7 +663,7 @@ Bool GameEngine::canUpdateGameLogic()
 	}
 	else
 	{
-		return canUpdateRegularGameLogic();
+		return canUpdateRegularGameLogic(logicTimeQueryFlags);
 	}
 }
 
@@ -684,19 +684,18 @@ Bool GameEngine::canUpdateNetworkGameLogic()
 }
 
 /// -----------------------------------------------------------------------------------------------
-Bool GameEngine::canUpdateRegularGameLogic()
+Bool GameEngine::canUpdateRegularGameLogic(UnsignedInt logicTimeQueryFlags)
 {
-	const Bool enabled = TheFramePacer->isLogicTimeScaleEnabled();
-	const Int logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
-	const Int maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+	const Int logicTimeScaleFps = TheFramePacer->getActualLogicTimeScaleFps(logicTimeQueryFlags);
+	const Int maxRenderFps = TheFramePacer->getActualFramesPerSecondLimit();
 
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	const Bool useFastMode = TheGlobalData->m_TiVOFastMode;
 #else	//always allow this cheat key if we're in a replay game.
 	const Bool useFastMode = TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame();
 #endif
 
-	if (useFastMode || !enabled || logicTimeScaleFps >= maxRenderFps)
+	if (useFastMode || logicTimeScaleFps >= maxRenderFps)
 	{
 		// Logic time scale is uncapped or larger equal Render FPS. Update straight away.
 		return true;
@@ -746,7 +745,7 @@ void GameEngine::update()
 			}
 		}
 
-		const Bool canUpdate = canUpdateGameLogic();
+		const Bool canUpdate = canUpdateGameLogic(FramePacer::IgnoreFrozenTime | FramePacer::IgnoreHaltedGame);
 		const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();
 		const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h
@@ -79,9 +79,9 @@ class GameEngine : public SubsystemInterface
 
 	virtual void resetSubsystems();
 
-	Bool canUpdateGameLogic();
+	Bool canUpdateGameLogic(UnsignedInt logicTimeQueryFlags);
 	Bool canUpdateNetworkGameLogic();
-	Bool canUpdateRegularGameLogic();
+	Bool canUpdateRegularGameLogic(UnsignedInt logicTimeQueryFlags);
 
 	virtual FileSystem *createFileSystem();								///< Factory for FileSystem classes
 	virtual LocalFileSystem *createLocalFileSystem() = 0;	///< Factory for LocalFileSystem classes
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -813,7 +813,7 @@ void GameEngine::resetSubsystems()
 }
 
 /// -----------------------------------------------------------------------------------------------
-Bool GameEngine::canUpdateGameLogic()
+Bool GameEngine::canUpdateGameLogic(UnsignedInt logicTimeQueryFlags)
 {
 	// Must be first.
 	TheGameLogic->preUpdate();
@@ -827,7 +827,7 @@ Bool GameEngine::canUpdateGameLogic()
 	}
 	else
 	{
-		return canUpdateRegularGameLogic();
+		return canUpdateRegularGameLogic(logicTimeQueryFlags);
 	}
 }
 
@@ -848,19 +848,18 @@ Bool GameEngine::canUpdateNetworkGameLogic()
 }
 
 /// -----------------------------------------------------------------------------------------------
-Bool GameEngine::canUpdateRegularGameLogic()
+Bool GameEngine::canUpdateRegularGameLogic(UnsignedInt logicTimeQueryFlags)
 {
-	const Bool enabled = TheFramePacer->isLogicTimeScaleEnabled();
-	const Int logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
-	const Int maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+	const Int logicTimeScaleFps = TheFramePacer->getActualLogicTimeScaleFps(logicTimeQueryFlags);
+	const Int maxRenderFps = TheFramePacer->getActualFramesPerSecondLimit();
 
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	const Bool useFastMode = TheGlobalData->m_TiVOFastMode;
 #else	//always allow this cheat key if we're in a replay game.
 	const Bool useFastMode = TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame();
 #endif
 
-	if (useFastMode || !enabled || logicTimeScaleFps >= maxRenderFps)
+	if (useFastMode || logicTimeScaleFps >= maxRenderFps)
 	{
 		// Logic time scale is uncapped or larger equal Render FPS. Update straight away.
 		return true;
@@ -910,7 +909,7 @@ void GameEngine::update()
 			}
 		}
 
-		const Bool canUpdate = canUpdateGameLogic();
+		const Bool canUpdate = canUpdateGameLogic(FramePacer::IgnoreFrozenTime | FramePacer::IgnoreHaltedGame);
 		const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();
 		const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();
 

Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ void GameEngine::resetSubsystems()`
`649`	`649`	`}`
`650`	`650`
`651`	`651`	`/// -----------------------------------------------------------------------------------------------`
`652`		`-Bool GameEngine::canUpdateGameLogic()`
	`652`	`+Bool GameEngine::canUpdateGameLogic(UnsignedInt logicTimeQueryFlags)`
`653`	`653`	`{`
`654`	`654`	`// Must be first.`
`655`	`655`	`TheGameLogic->preUpdate();`
`@@ -663,7 +663,7 @@ Bool GameEngine::canUpdateGameLogic()`
`663`	`663`	`}`
`664`	`664`	`else`
`665`	`665`	`{`
`666`		`- return canUpdateRegularGameLogic();`
	`666`	`+ return canUpdateRegularGameLogic(logicTimeQueryFlags);`
`667`	`667`	`}`
`668`	`668`	`}`
`669`	`669`
`@@ -684,19 +684,18 @@ Bool GameEngine::canUpdateNetworkGameLogic()`
`684`	`684`	`}`
`685`	`685`
`686`	`686`	`/// -----------------------------------------------------------------------------------------------`
`687`		`-Bool GameEngine::canUpdateRegularGameLogic()`
	`687`	`+Bool GameEngine::canUpdateRegularGameLogic(UnsignedInt logicTimeQueryFlags)`
`688`	`688`	`{`
`689`		`- const Bool enabled = TheFramePacer->isLogicTimeScaleEnabled();`
`690`		`- const Int logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();`
`691`		`- const Int maxRenderFps = TheFramePacer->getFramesPerSecondLimit();`
	`689`	`+ const Int logicTimeScaleFps = TheFramePacer->getActualLogicTimeScaleFps(logicTimeQueryFlags);`
	`690`	`+ const Int maxRenderFps = TheFramePacer->getActualFramesPerSecondLimit();`
`692`	`691`
`693`	`692`	`#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)`
`694`	`693`	`const Bool useFastMode = TheGlobalData->m_TiVOFastMode;`
`695`	`694`	`#else //always allow this cheat key if we're in a replay game.`
`696`	`695`	`const Bool useFastMode = TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame();`
`697`	`696`	`#endif`
`698`	`697`
`699`		`- if (useFastMode \|\| !enabled \|\| logicTimeScaleFps >= maxRenderFps)`
	`698`	`+ if (useFastMode \|\| logicTimeScaleFps >= maxRenderFps)`
`700`	`699`	`{`
`701`	`700`	`// Logic time scale is uncapped or larger equal Render FPS. Update straight away.`
`702`	`701`	`return true;`
`@@ -746,7 +745,7 @@ void GameEngine::update()`
`746`	`745`	`}`
`747`	`746`	`}`
`748`	`747`
`749`		`- const Bool canUpdate = canUpdateGameLogic();`
	`748`	`+ const Bool canUpdate = canUpdateGameLogic(FramePacer::IgnoreFrozenTime \| FramePacer::IgnoreHaltedGame);`
`750`	`749`	`const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();`
`751`	`750`	`const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();`
`752`	`751`
Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ void GameEngine::resetSubsystems()`
`813`	`813`	`}`
`814`	`814`
`815`	`815`	`/// -----------------------------------------------------------------------------------------------`
`816`		`-Bool GameEngine::canUpdateGameLogic()`
	`816`	`+Bool GameEngine::canUpdateGameLogic(UnsignedInt logicTimeQueryFlags)`
`817`	`817`	`{`
`818`	`818`	`// Must be first.`
`819`	`819`	`TheGameLogic->preUpdate();`
`@@ -827,7 +827,7 @@ Bool GameEngine::canUpdateGameLogic()`
`827`	`827`	`}`
`828`	`828`	`else`
`829`	`829`	`{`
`830`		`- return canUpdateRegularGameLogic();`
	`830`	`+ return canUpdateRegularGameLogic(logicTimeQueryFlags);`
`831`	`831`	`}`
`832`	`832`	`}`
`833`	`833`
`@@ -848,19 +848,18 @@ Bool GameEngine::canUpdateNetworkGameLogic()`
`848`	`848`	`}`
`849`	`849`
`850`	`850`	`/// -----------------------------------------------------------------------------------------------`
`851`		`-Bool GameEngine::canUpdateRegularGameLogic()`
	`851`	`+Bool GameEngine::canUpdateRegularGameLogic(UnsignedInt logicTimeQueryFlags)`
`852`	`852`	`{`
`853`		`- const Bool enabled = TheFramePacer->isLogicTimeScaleEnabled();`
`854`		`- const Int logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();`
`855`		`- const Int maxRenderFps = TheFramePacer->getFramesPerSecondLimit();`
	`853`	`+ const Int logicTimeScaleFps = TheFramePacer->getActualLogicTimeScaleFps(logicTimeQueryFlags);`
	`854`	`+ const Int maxRenderFps = TheFramePacer->getActualFramesPerSecondLimit();`
`856`	`855`
`857`	`856`	`#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)`
`858`	`857`	`const Bool useFastMode = TheGlobalData->m_TiVOFastMode;`
`859`	`858`	`#else //always allow this cheat key if we're in a replay game.`
`860`	`859`	`const Bool useFastMode = TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame();`
`861`	`860`	`#endif`
`862`	`861`
`863`		`- if (useFastMode \|\| !enabled \|\| logicTimeScaleFps >= maxRenderFps)`
	`862`	`+ if (useFastMode \|\| logicTimeScaleFps >= maxRenderFps)`
`864`	`863`	`{`
`865`	`864`	`// Logic time scale is uncapped or larger equal Render FPS. Update straight away.`
`866`	`865`	`return true;`
`@@ -910,7 +909,7 @@ void GameEngine::update()`
`910`	`909`	`}`
`911`	`910`	`}`
`912`	`911`
`913`		`- const Bool canUpdate = canUpdateGameLogic();`
	`912`	`+ const Bool canUpdate = canUpdateGameLogic(FramePacer::IgnoreFrozenTime \| FramePacer::IgnoreHaltedGame);`
`914`	`913`	`const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();`
`915`	`914`	`const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();`
`916`	`915`