Skip to content

Commit b43ddfc

Browse files
committed
fix: updated InitRandom calls to use random number from random generator
1 parent daf86de commit b43ddfc

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,12 @@ static void doGameStart()
7878
msg->appendIntegerArgument(0);
7979

8080
/// @todo: when Campaign & skirmish are separated, make campaign have fixed seed and skirmish random.
81-
InitRandom(0);
82-
/*
83-
if (TheGlobalData->m_fixedSeed >= 0)
84-
InitGameLogicRandom(TheGlobalData->m_fixedSeed);
85-
else
86-
InitGameLogicRandom(GameClientRandomValue(0, INT_MAX - 1));
87-
*/
81+
/// InitRandom(0);
82+
if (TheGlobalData->m_fixedSeed >= 0) {
83+
InitRandom(TheGlobalData->m_fixedSeed);
84+
} else {
85+
InitRandom(GameClientRandomValue(0, INT_MAX - 1));
86+
}
8887

8988
isShuttingDown = true;
9089
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,12 @@ static void restartMissionMenu()
243243
TheScriptEngine->getGlobalDifficulty(),
244244
rankPointsStartedWith)
245245
);
246-
247-
InitRandom(seed);
246+
if (TheGlobalData->m_fixedSeed >= 0) {
247+
InitRandom(TheGlobalData->m_fixedSeed);
248+
//InitRandom(0);
249+
} else {
250+
InitGameLogicRandom(GameClientRandomValue(0, INT_MAX - 1));
251+
}
248252
}
249253
//TheTransitionHandler->remove("QuitFull"); //KRISMORNESS ADD
250254
//quitMenuLayout = nullptr; //KRISMORNESS ADD

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ void Shell::showShellMap(Bool useShellMap )
542542
TheGameLogic->exitGame();
543543

544544
TheWritableGlobalData->m_pendingFile = TheGlobalData->m_shellMapName;
545-
InitGameLogicRandom(0);
545+
InitGameLogicRandom(GameClientRandomValue(0, INT_MAX - 1));
546546
GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
547547
msg->appendIntegerArgument(GAME_SHELL);
548548
m_shellMapOn = TRUE;

0 commit comments

Comments
 (0)