From af9a6190443417ac510df31f0d4d5a56160ad7cd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 4 Jun 2004 06:34:52 +0000 Subject: [PATCH] seed and course change in GameState::FinishStage --- stepmania/src/GameState.cpp | 6 ++++++ stepmania/src/ScreenEvaluation.cpp | 2 -- stepmania/src/ScreenSelectMusic.cpp | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 8839be4e86..78a35e626f 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -636,6 +636,12 @@ void GameState::FinishStage() m_iNumStagesOfThisSong = 0; + // The round has ended; change the seed. + GAMESTATE->m_iRoundSeed = rand(); + + // We have a new seed; courses change. + SONGMAN->RegenRandomTrailEntries(); + // // Add step totals. Use fRadarActual, since the player might have failed partway // through the song, in which case we don't want to give credit for the rest of the diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 5fbc9be22d..3eb643b19f 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -1520,8 +1520,6 @@ void ScreenEvaluation::EndScreen() FOREACH_PlayerNumber( p ) m_Grades[p].SettleImmediately(); - GAMESTATE->m_iRoundSeed = rand(); - if( !PREFSMAN->m_bEventMode ) { switch( m_Type ) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 11816607b1..722aea8967 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -68,8 +68,6 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU ); - SONGMAN->RegenRandomTrailEntries(); - m_DisplayMode = GAMESTATE->IsCourseMode() ? DISPLAY_COURSES : DISPLAY_SONGS; /* Finish any previous stage. It's OK to call this when we havn't played a stage yet.