Skip to content

Commit 6dacb8a

Browse files
committed
Made the seed value consistent for 'GAME_SINGLE_PLAYER'.
1 parent 2068471 commit 6dacb8a

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ void reallyDoStart( void )
421421

422422
TheWritableGlobalData->m_mapName = TheSkirmishGameInfo->getMap();
423423
TheSkirmishGameInfo->startGame(0);
424-
InitGameLogicRandom(TheSkirmishGameInfo->getSeed());
425424

426425
Bool isSkirmish = TRUE;
427426
const MapMetaData *md = TheMapCache->findMap(TheSkirmishGameInfo->getMap());
@@ -432,6 +431,8 @@ void reallyDoStart( void )
432431

433432
if (isSkirmish)
434433
{
434+
InitGameLogicRandom(TheSkirmishGameInfo->getSeed());
435+
435436
GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
436437
msg->appendIntegerArgument(GAME_SKIRMISH);
437438
msg->appendIntegerArgument(DIFFICULTY_NORMAL); // not really used; just specified so we can add the game speed last
@@ -440,6 +441,8 @@ void reallyDoStart( void )
440441
}
441442
else
442443
{
444+
InitGameLogicRandom(0);
445+
443446
GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
444447
msg->appendIntegerArgument(GAME_SINGLE_PLAYER);
445448
msg->appendIntegerArgument(DIFFICULTY_NORMAL); // not really used; just specified so we can add the game speed last

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ void reallyDoStart( void )
432432

433433
TheWritableGlobalData->m_mapName = TheSkirmishGameInfo->getMap();
434434
TheSkirmishGameInfo->startGame(0);
435-
InitGameLogicRandom(TheSkirmishGameInfo->getSeed());
436435

437436
Bool isSkirmish = TRUE;
438437
const MapMetaData *md = TheMapCache->findMap(TheSkirmishGameInfo->getMap());
@@ -443,6 +442,8 @@ void reallyDoStart( void )
443442

444443
if (isSkirmish)
445444
{
445+
InitGameLogicRandom(TheSkirmishGameInfo->getSeed());
446+
446447
GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
447448
msg->appendIntegerArgument(GAME_SKIRMISH);
448449
msg->appendIntegerArgument(DIFFICULTY_NORMAL); // not really used; just specified so we can add the game speed last
@@ -451,6 +452,8 @@ void reallyDoStart( void )
451452
}
452453
else
453454
{
455+
InitGameLogicRandom(0);
456+
454457
GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
455458
msg->appendIntegerArgument(GAME_SINGLE_PLAYER);
456459
msg->appendIntegerArgument(DIFFICULTY_NORMAL); // not really used; just specified so we can add the game speed last

0 commit comments

Comments
 (0)