Skip to content

tweak(random): Replace InitGameLogicRandom with InitRandom for consistent client and audio seeds #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 6 commits into from
Feb 28, 2026
Merged

tweak(random): Replace InitGameLogicRandom with InitRandom for consistent client and audio seeds #2339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ff44c2
Changed 'InitGameLogicRandom' to 'InitRandom'.
Caball009 Feb 21, 2026
9ca2cfb
Removed 'InitGameLogicRandom'.
Caball009 Feb 21, 2026
4a87a07
Merge branch 'main' into fix_consistent_seed_values
Caball009 Feb 22, 2026
f6aa7d2
Removed EA todo comment.
Caball009 Feb 22, 2026
f63d6ec
Merge branch 'main' into fix_consistent_seed_values
Caball009 Feb 27, 2026
a7ba441
Replicated in Generals.
Caball009 Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Core/GameEngine/Include/Common/RandomValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
15 changes: 0 additions & 15 deletions Core/GameEngine/Source/Common/RandomValue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,21 +177,6 @@ DEBUG_LOG(( "InitRandom %08lx",seed));
#endif
}

void InitGameLogicRandom( UnsignedInt seed )
{
#ifdef DETERMINISTIC
Comment thread
Caball009 marked this conversation as resolved.
// 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
//
Expand Down
6 changes: 3 additions & 3 deletions Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}

Expand Down
1 change: 0 additions & 1 deletion Generals/Code/GameEngine/Source/Common/Recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
}

Expand Down
7 changes: 0 additions & 7 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions ...rals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -440,7 +440,7 @@ void reallyDoStart()
}
else
{
InitGameLogicRandom(0);
InitRandom(0);

GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
msg->appendIntegerArgument(GAME_SINGLE_PLAYER);
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
}

Expand Down
7 changes: 0 additions & 7 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment thread
Caball009 marked this conversation as resolved.
InitGameLogicRandom(TheGlobalData->m_fixedSeed);
else
InitGameLogicRandom(GameClientRandomValue(0, INT_MAX - 1));
*/

isShuttingDown = true;
}
Expand Down
4 changes: 2 additions & 2 deletions ...lsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -451,7 +451,7 @@ void reallyDoStart()
}
else
{
InitGameLogicRandom(0);
InitRandom(0);

GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
msg->appendIntegerArgument(GAME_SINGLE_PLAYER);
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading