fix(skirmish): Improve determinism for restarted games by resetting slot values (#2373)

Author: Caball009

Core/GameEngine/Include/GameNetwork/GameInfo.h

@@ -100,7 +100,8 @@ class GameSlot
 	void setNATBehavior( FirewallHelperClass::FirewallBehaviorType NATBehavior) { m_NATBehavior = NATBehavior; }
 	FirewallHelperClass::FirewallBehaviorType getNATBehavior() const { return m_NATBehavior; }
 
-	void saveOffOriginalInfo();
+	void saveOriginalSetup();
+	Bool hasSavedOriginalSetup() const { return m_hasSavedOriginalSetup; }
 	Int getOriginalPlayerTemplate() const	{ return m_origPlayerTemplate; }
 	Int getOriginalColor() const						{ return m_origColor; }
 	Int getOriginalStartPos() const				{ return m_origStartPos; }
@@ -130,6 +131,7 @@ class GameSlot
 	Bool m_isAccepted;
 	Bool m_hasMap;
 	Bool m_isMuted;
+	Bool m_hasSavedOriginalSetup;
 	Int m_color;																			///< color, or -1 for random
 	Int m_startPos;																		///< start position, or -1 for random
 	Int m_playerTemplate;															///< PlayerTemplate

Core/GameEngine/Source/GameNetwork/GameInfo.cpp

@@ -70,20 +70,23 @@ void GameSlot::reset()
 	m_disconnected = FALSE;
 	m_port = 0;
 	m_isMuted = FALSE;
+	m_hasSavedOriginalSetup = FALSE;
 	m_origPlayerTemplate = -1;
 	m_origStartPos = -1;
 	m_origColor = -1;
 }
 
-void GameSlot::saveOffOriginalInfo()
+void GameSlot::saveOriginalSetup()
 {
-	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - orig was color=%d, pos=%d, house=%d",
+	DEBUG_LOG(("GameSlot::saveOriginalSetup() - orig was color=%d, pos=%d, house=%d",
 		m_origColor, m_origStartPos, m_origPlayerTemplate));
 	m_origPlayerTemplate = m_playerTemplate;
 	m_origStartPos = m_startPos;
 	m_origColor = m_color;
-	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - color=%d, pos=%d, house=%d",
+	DEBUG_LOG(("GameSlot::saveOriginalSetup() - color=%d, pos=%d, house=%d",
 		m_color, m_startPos, m_playerTemplate));
+
+	m_hasSavedOriginalSetup = TRUE;
 }
 
 static Int getSlotIndex(const GameSlot *slot)
@@ -1597,7 +1600,7 @@ void SkirmishGameInfo::xfer( Xfer *xfer )
 			m_slot[slot]->setPlayerTemplate(origPlayerTemplate);
 			m_slot[slot]->setStartPos(origStartPos);
 			m_slot[slot]->setColor(origColor);
-			m_slot[slot]->saveOffOriginalInfo();
+			m_slot[slot]->saveOriginalSetup();
 
 			m_slot[slot]->setTeamNumber(teamNumber);
 			m_slot[slot]->setColor(color);

Generals/Code/GameEngine/Include/GameLogic/GameLogic.h

@@ -78,6 +78,8 @@ enum GameMode CPP_11(: Int)
 	GAME_NONE
 };
 
+const char* toString(GameMode mode);
+
 enum
 {
 	CRC_CACHED,

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

@@ -202,6 +202,30 @@ void setFPMode()
 	_controlfp(newVal, _MCW_PC | _MCW_RC);
 }
 
+//-------------------------------------------------------------------------------------------------
+const char* toString(GameMode mode)
+{
+	switch (mode)
+	{
+		case GAME_SINGLE_PLAYER:
+			return "GAME_SINGLE_PLAYER";
+		case GAME_LAN:
+			return "GAME_LAN";
+		case GAME_SKIRMISH:
+			return "GAME_SKIRMISH";
+		case GAME_REPLAY:
+			return "GAME_REPLAY";
+		case GAME_SHELL:
+			return "GAME_SHELL";
+		case GAME_INTERNET:
+			return "GAME_INTERNET";
+		case GAME_NONE:
+			return "GAME_NONE";
+		default:
+			return "GAME_UNKNOWN";
+	}
+}
+
 // ------------------------------------------------------------------------------------------------
 /** GameLogic class constructor */
 // ------------------------------------------------------------------------------------------------
@@ -1081,7 +1105,20 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		{
 			GameSlot *slot = TheGameInfo->getSlot(i);
 			if (!loadingSaveGame) {
-				slot->saveOffOriginalInfo();
+				if (slot->hasSavedOriginalSetup())
+				{
+					DEBUG_ASSERTCRASH(m_gameMode == GAME_SKIRMISH, ("Expected GAME_SKIRMISH but got %s", toString(m_gameMode)));
+
+					// TheSuperHackers @fix Caball009 19/03/2026 Random color, position and faction are based on the logical seed. For improved determinism,
+					// restarted games now set the original values so that the games start with the exact same logical seed values as the first time.
+					slot->setColor(slot->getOriginalColor());
+					slot->setStartPos(slot->getOriginalStartPos());
+					slot->setPlayerTemplate(slot->getOriginalPlayerTemplate());
+				}
+				else
+				{
+					slot->saveOriginalSetup();
+				}
 			}
 			if (slot->isAI())
 			{

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

@@ -79,6 +79,8 @@ enum GameMode CPP_11(: Int)
 	GAME_NONE
 };
 
+const char* toString(GameMode mode);
+
 enum
 {
 	CRC_CACHED,

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

@@ -213,6 +213,30 @@ void setFPMode()
 	_controlfp(newVal, _MCW_PC | _MCW_RC);
 }
 
+//-------------------------------------------------------------------------------------------------
+const char* toString(GameMode mode)
+{
+	switch (mode)
+	{
+		case GAME_SINGLE_PLAYER:
+			return "GAME_SINGLE_PLAYER";
+		case GAME_LAN:
+			return "GAME_LAN";
+		case GAME_SKIRMISH:
+			return "GAME_SKIRMISH";
+		case GAME_REPLAY:
+			return "GAME_REPLAY";
+		case GAME_SHELL:
+			return "GAME_SHELL";
+		case GAME_INTERNET:
+			return "GAME_INTERNET";
+		case GAME_NONE:
+			return "GAME_NONE";
+		default:
+			return "GAME_UNKNOWN";
+	}
+}
+
 // ------------------------------------------------------------------------------------------------
 /** GameLogic class constructor */
 // ------------------------------------------------------------------------------------------------
@@ -1241,7 +1265,20 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		{
 			GameSlot *slot = TheGameInfo->getSlot(i);
 			if (!loadingSaveGame) {
-				slot->saveOffOriginalInfo();
+				if (slot->hasSavedOriginalSetup())
+				{
+					DEBUG_ASSERTCRASH(m_gameMode == GAME_SKIRMISH, ("Expected GAME_SKIRMISH but got %s", toString(m_gameMode)));
+
+					// TheSuperHackers @fix Caball009 19/03/2026 Random color, position and faction are based on the logical seed. For improved determinism,
+					// restarted games now set the original values so that the games start with the exact same logical seed values as the first time.
+					slot->setColor(slot->getOriginalColor());
+					slot->setStartPos(slot->getOriginalStartPos());
+					slot->setPlayerTemplate(slot->getOriginalPlayerTemplate());
+				}
+				else
+				{
+					slot->saveOriginalSetup();
+				}
 			}
 			if (slot->isAI())
 			{