Also consider headless game for busy state

Author: xezon

GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h

@@ -64,7 +64,7 @@ enum OSDisplayOtherFlags CPP_11(: UnsignedInt)
 OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedInt buttonFlags, UnsignedInt otherFlags);
 
 // TheSuperHackers @feature Tell the Operating System that the game is considered busy
-// and we would not like the display screen to shut off.
-void OSDisplaySetBusyState(Bool busy);
+// and we would not like the display screen and/or system to shut off.
+void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem);
 
 #endif /* __OSDISPLAY_H__ */

GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h

@@ -273,6 +273,8 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 private:
 
+	void updateDisplayBusyState();
+
 	void pauseGameLogic(Bool paused);
 	void pauseGameSound(Bool paused);
 	void pauseGameMusic(Bool paused);

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -1119,6 +1119,16 @@ void GameLogic::deleteLoadScreen( void )
 
 }
 
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void GameLogic::updateDisplayBusyState()
+{
+	const Bool busySystem = isInInteractiveGame() && !isGamePaused();
+	const Bool busyDisplay = busySystem && !TheGlobalData->m_headless;
+
+	OSDisplaySetBusyState(busyDisplay, busySystem);
+}
+
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void GameLogic::setGameMode( GameMode mode )
@@ -1128,7 +1138,7 @@ void GameLogic::setGameMode( GameMode mode )
 
 	TheMouse->onGameModeChanged(prev, mode);
 
-	OSDisplaySetBusyState(isInInteractiveGame() && !isGamePaused());
+	updateDisplayBusyState();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -4292,7 +4302,7 @@ void GameLogic::setGamePaused( Bool paused, Bool pauseMusic, Bool pauseInput )
 	pauseGameMusic(paused && pauseMusic);
 	pauseGameInput(paused && pauseInput);
 
-	OSDisplaySetBusyState(isInInteractiveGame() && !paused);
+	updateDisplayBusyState();
 }
 
 // ------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp

@@ -125,14 +125,11 @@ OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedIn
 }
 
 //-------------------------------------------------------------------------------------------------
-void OSDisplaySetBusyState(Bool busy)
+void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem)
 {
-	if (busy)
-	{
-		::SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
-	}
-	else
-	{
-		::SetThreadExecutionState(ES_CONTINUOUS);
-	}
+	EXECUTION_STATE state = ES_CONTINUOUS;
+	state |= busyDisplay ? ES_DISPLAY_REQUIRED : 0;
+	state |= busySystem ? ES_SYSTEM_REQUIRED : 0;
+
+	::SetThreadExecutionState(state);
 }