From 1cb3fdc3d902da6c535e0d7928b9d42513efa271 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 11 Feb 2007 04:46:30 +0000 Subject: [PATCH] Separate forced song and player mods. --- stepmania/src/GameState.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 46ae5b9a5a..36b91597ab 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -94,7 +94,8 @@ Song* GameState::GetDefaultSong() const static const ThemeMetric GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1"); static const ThemeMetric GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2"); -static DynamicThemeMetric ARE_STAGE_MODS_FORCED( "GameState","AreStageModsForced" ); +static DynamicThemeMetric ARE_STAGE_PLAYER_MODS_FORCED( "GameState","AreStagePlayerModsForced" ); +static DynamicThemeMetric ARE_STAGE_SONG_MODS_FORCED( "GameState","AreStageSongModsForced" ); static Preference g_Premium( "Premium", PREMIUM_NONE ); @@ -541,13 +542,14 @@ void GameState::BeginStage() ResetStageStatistics(); AdjustSync::ResetOriginalSyncData(); - ARE_STAGE_MODS_FORCED.Read(); // XXX: where does this belong? - if( !ARE_STAGE_MODS_FORCED ) + if( !ARE_STAGE_PLAYER_MODS_FORCED ) { FOREACH_PlayerNumber( p ) m_pPlayerState[p]->m_PlayerOptions.Assign( ModsLevel_Stage, m_pPlayerState[p]->m_PlayerOptions.GetPreferred() ); - m_SongOptions.Assign( ModsLevel_Stage, m_SongOptions.GetPreferred() ); } + if( !ARE_STAGE_SONG_MODS_FORCED ) + m_SongOptions.Assign( ModsLevel_Stage, m_SongOptions.GetPreferred() ); + STATSMAN->m_CurStageStats.m_fMusicRate = m_SongOptions.GetSong().m_fMusicRate; m_iNumStagesOfThisSong = GetNumStagesForCurrentSong(); ASSERT( m_iNumStagesOfThisSong != -1 );