From cc3e8589ef24edbdd8cce8d06e3130cc2d5199de Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 2 Jun 2008 10:06:51 +0000 Subject: [PATCH] add AllowExtra2 --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/GameState.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 66b8187b54..3b9729c453 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -4117,6 +4117,7 @@ DefaultSong="" AreStagePlayerModsForced=AreStagePlayerModsForced AreStageSongModsForced=AreStageSongModsForced GradeTierForExtra1="Grade_Tier03" +AllowExtra2=true GradeTierForExtra2="Grade_Tier03" AllowLateJoin=false ProfileRecordFeats=true diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index ffd6320a90..b1add3c62e 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -96,11 +96,12 @@ Song* GameState::GetDefaultSong() const return sid.ToSong(); } -static const ThemeMetric GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1"); -static const ThemeMetric GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2"); +static const ThemeMetric GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1"); +static const ThemeMetric ALLOW_EXTRA_2 ("GameState","AllowExtra2"); +static const ThemeMetric GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2"); -static ThemeMetric ARE_STAGE_PLAYER_MODS_FORCED( "GameState","AreStagePlayerModsForced" ); -static ThemeMetric ARE_STAGE_SONG_MODS_FORCED( "GameState","AreStageSongModsForced" ); +static ThemeMetric ARE_STAGE_PLAYER_MODS_FORCED ("GameState","AreStagePlayerModsForced"); +static ThemeMetric ARE_STAGE_SONG_MODS_FORCED ("GameState","AreStageSongModsForced"); static Preference g_Premium( "Premium", Premium_Off ); Preference GameState::m_bAutoJoin( "AutoJoin", false ); @@ -1215,7 +1216,7 @@ bool GameState::HasEarnedExtraStageInternal() const if( IsExtraStage() ) { - if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER_FOR_EXTRA_2 ) + if( ALLOW_EXTRA_2 && STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER_FOR_EXTRA_2 ) return true; } else if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER_FOR_EXTRA_1 )