diff --git a/Core/GameEngine/Include/Common/RandomValue.h b/Core/GameEngine/Include/Common/RandomValue.h index 919b267cf35..8cc97d5d844 100644 --- a/Core/GameEngine/Include/Common/RandomValue.h +++ b/Core/GameEngine/Include/Common/RandomValue.h @@ -32,7 +32,6 @@ extern void InitRandom(); extern void InitRandom( UnsignedInt seed ); -extern void InitGameLogicRandom( UnsignedInt seed ); ///< Set the GameLogic seed to a known value at game start extern UnsignedInt GetGameLogicRandomSeed(); ///< Get the seed (used for replays) extern UnsignedInt GetGameLogicRandomSeedCRC();///< Get the seed (used for CRCs) diff --git a/Core/GameEngine/Source/Common/RandomValue.cpp b/Core/GameEngine/Source/Common/RandomValue.cpp index 2935c756b86..e5a871d65f7 100644 --- a/Core/GameEngine/Source/Common/RandomValue.cpp +++ b/Core/GameEngine/Source/Common/RandomValue.cpp @@ -177,21 +177,6 @@ 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 // diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp index 8170cc20646..04714a4de4b 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp @@ -852,9 +852,9 @@ void GameSpyStagingRoom::launchGame() TheWritableGlobalData->m_useFpsLimit = false; - // Set the random seed - InitGameLogicRandom( getSeed() ); - DEBUG_LOG(("InitGameLogicRandom( %d )", getSeed())); + // Set the seeds + InitRandom( getSeed() ); + DEBUG_LOG(("InitRandom( %d )", getSeed())); // mark us as "Loading" in the buddy list BuddyRequest req; diff --git a/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp index cb8b1d18465..f87a2c76ed9 100644 --- a/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp +++ b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp @@ -256,9 +256,9 @@ void LANAPI::OnGameStart() TheWritableGlobalData->m_useFpsLimit = false; - // Set the random seed - InitGameLogicRandom( m_currentGame->getSeed() ); - DEBUG_LOG(("InitGameLogicRandom( %d )", m_currentGame->getSeed())); + // Set the seeds + InitRandom( m_currentGame->getSeed() ); + DEBUG_LOG(("InitRandom( %d )", m_currentGame->getSeed())); } } diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp index 1129ef90a38..19b88a76b38 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -1300,7 +1300,6 @@ Bool RecorderClass::playbackFile(AsciiString filename) if( maxFPS != 0 ) msg->appendIntegerArgument(maxFPS); TheCommandList->appendMessage( msg ); - //InitGameLogicRandom( m_gameInfo.getSeed()); InitRandom( m_gameInfo.getSeed() ); } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp index 0ebf489382e..06867720afa 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp @@ -77,14 +77,7 @@ static void doGameStart() msg->appendIntegerArgument(s_AIDiff); msg->appendIntegerArgument(0); - /// @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; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 289beb57347..4ade01370cb 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -430,7 +430,7 @@ void reallyDoStart() if (isSkirmish) { - InitGameLogicRandom(TheSkirmishGameInfo->getSeed()); + InitRandom(TheSkirmishGameInfo->getSeed()); GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME ); msg->appendIntegerArgument(GAME_SKIRMISH); @@ -440,7 +440,7 @@ void reallyDoStart() } else { - InitGameLogicRandom(0); + InitRandom(0); GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME ); msg->appendIntegerArgument(GAME_SINGLE_PLAYER); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index f63d486e7cb..fff2cf12c94 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -535,7 +535,7 @@ void Shell::showShellMap(Bool useShellMap ) TheGameLogic->exitGame(); TheWritableGlobalData->m_pendingFile = TheGlobalData->m_shellMapName; - InitGameLogicRandom(0); + InitRandom(0); GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME ); msg->appendIntegerArgument(GAME_SHELL); m_shellMapOn = TRUE; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index abf4bfdb5ac..8150064a028 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -1303,7 +1303,6 @@ Bool RecorderClass::playbackFile(AsciiString filename) if( maxFPS != 0 ) msg->appendIntegerArgument(maxFPS); TheCommandList->appendMessage( msg ); - //InitGameLogicRandom( m_gameInfo.getSeed()); InitRandom( m_gameInfo.getSeed() ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp index f2642ec1b44..8c4972cb70d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp @@ -77,14 +77,7 @@ static void doGameStart() msg->appendIntegerArgument(s_AIDiff); msg->appendIntegerArgument(0); - /// @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; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index a05e338a235..580098b6af9 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -441,7 +441,7 @@ void reallyDoStart() if (isSkirmish) { - InitGameLogicRandom(TheSkirmishGameInfo->getSeed()); + InitRandom(TheSkirmishGameInfo->getSeed()); GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME ); msg->appendIntegerArgument(GAME_SKIRMISH); @@ -451,7 +451,7 @@ void reallyDoStart() } else { - InitGameLogicRandom(0); + InitRandom(0); GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME ); msg->appendIntegerArgument(GAME_SINGLE_PLAYER); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index ee599b48146..bf9eb5f3387 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/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; - InitGameLogicRandom(0); + InitRandom(0); GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME ); msg->appendIntegerArgument(GAME_SHELL); m_shellMapOn = TRUE;