Revert "Changed seed functions for consistency."

This reverts commit 1ef1964.

Author: Caball009

Core/GameEngine/Include/Common/RandomValue.h

@@ -32,6 +32,7 @@
 
 extern void InitRandom( void );
 extern void InitRandom( UnsignedInt seed );
+extern void InitGameLogicRandom( UnsignedInt seed ); ///< Set the GameLogic seed to a known value at game start
 extern UnsignedInt GetGameLogicRandomSeed( void );   ///< Get the seed (used for replays)
 extern UnsignedInt GetGameLogicRandomSeedCRC( void );///< Get the seed (used for CRCs)
 

Core/GameEngine/Source/Common/RandomValue.cpp

@@ -177,6 +177,21 @@ DEBUG_LOG(( "InitRandom %08lx",seed));
 #endif
 }
 
+void InitGameLogicRandom( UnsignedInt seed )
+{
+#ifdef DETERMINISTIC
+	// needs to be the same every time
+	seedRandom(0, theGameLogicSeed);
+	theGameLogicBaseSeed = 0;
+#else
+	seedRandom(seed, theGameLogicSeed);
+	theGameLogicBaseSeed = seed;
+#endif
+#ifdef DEBUG_RANDOM_LOGIC
+DEBUG_LOG(( "InitRandom Logic %08lx",seed));
+#endif
+}
+
 //
 // Integer random value
 //

Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp

@@ -853,8 +853,8 @@ void GameSpyStagingRoom::launchGame( void )
 	TheWritableGlobalData->m_useFpsLimit = false;
 
 	// Set the random seed
-	InitRandom( getSeed() );
-	DEBUG_LOG(("InitRandom( %d )", getSeed()));
+	InitGameLogicRandom( getSeed() );
+	DEBUG_LOG(("InitGameLogicRandom( %d )", getSeed()));
 
 	// mark us as "Loading" in the buddy list
 	BuddyRequest req;

Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp

@@ -257,8 +257,8 @@ void LANAPI::OnGameStart( void )
 		TheWritableGlobalData->m_useFpsLimit = false;
 
 		// Set the random seed
-		InitRandom( m_currentGame->getSeed() );
-		DEBUG_LOG(("InitRandom( %d )", m_currentGame->getSeed()));
+		InitGameLogicRandom( m_currentGame->getSeed() );
+		DEBUG_LOG(("InitGameLogicRandom( %d )", m_currentGame->getSeed()));
 	}
 }
 

GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp

@@ -1303,6 +1303,7 @@ Bool RecorderClass::playbackFile(AsciiString filename)
 		if( maxFPS != 0 )
 			msg->appendIntegerArgument(maxFPS);
 		TheCommandList->appendMessage( msg );
+		//InitGameLogicRandom( m_gameInfo.getSeed());
 		InitRandom( m_gameInfo.getSeed() );
 	}
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp

@@ -79,6 +79,12 @@ static void doGameStart( void )
 
 	/// @todo: when Campaign & skirmish are separated, make campaign have fixed seed and skirmish random.
 	InitRandom(0);
+	/*
+	if (TheGlobalData->m_fixedSeed >= 0)
+		InitGameLogicRandom(TheGlobalData->m_fixedSeed);
+	else
+		InitGameLogicRandom(GameClientRandomValue(0, INT_MAX - 1));
+	*/
 
 	isShuttingDown = true;
 }

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp

@@ -441,7 +441,7 @@ void reallyDoStart( void )
 
 	if (isSkirmish)
 	{
-		InitRandom(TheSkirmishGameInfo->getSeed());
+		InitGameLogicRandom(TheSkirmishGameInfo->getSeed());
 
 		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
 		msg->appendIntegerArgument(GAME_SKIRMISH);
@@ -451,7 +451,7 @@ void reallyDoStart( void )
 	}
 	else
 	{
-		InitRandom(0);
+		InitGameLogicRandom(0);
 
 		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
 		msg->appendIntegerArgument(GAME_SINGLE_PLAYER);

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp

@@ -542,7 +542,7 @@ void Shell::showShellMap(Bool useShellMap )
 			TheGameLogic->exitGame();
 
 		TheWritableGlobalData->m_pendingFile = TheGlobalData->m_shellMapName;
-		InitRandom(0);
+		InitGameLogicRandom(0);
 		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
 		msg->appendIntegerArgument(GAME_SHELL);
 		m_shellMapOn = TRUE;