add AllowExtra2

This commit is contained in:
Chris Danford
2008-06-02 10:06:51 +00:00
parent ba9a585d51
commit cc3e8589ef
2 changed files with 7 additions and 5 deletions
+1
View File
@@ -4117,6 +4117,7 @@ DefaultSong=""
AreStagePlayerModsForced=AreStagePlayerModsForced AreStagePlayerModsForced=AreStagePlayerModsForced
AreStageSongModsForced=AreStageSongModsForced AreStageSongModsForced=AreStageSongModsForced
GradeTierForExtra1="Grade_Tier03" GradeTierForExtra1="Grade_Tier03"
AllowExtra2=true
GradeTierForExtra2="Grade_Tier03" GradeTierForExtra2="Grade_Tier03"
AllowLateJoin=false AllowLateJoin=false
ProfileRecordFeats=true ProfileRecordFeats=true
+4 -3
View File
@@ -97,10 +97,11 @@ Song* GameState::GetDefaultSong() const
} }
static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1"); static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1");
static const ThemeMetric<bool> ALLOW_EXTRA_2 ("GameState","AllowExtra2");
static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2"); static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2");
static ThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED( "GameState","AreStagePlayerModsForced" ); static ThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED ("GameState","AreStagePlayerModsForced");
static ThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED( "GameState","AreStageSongModsForced" ); static ThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED ("GameState","AreStageSongModsForced");
static Preference<Premium> g_Premium( "Premium", Premium_Off ); static Preference<Premium> g_Premium( "Premium", Premium_Off );
Preference<bool> GameState::m_bAutoJoin( "AutoJoin", false ); Preference<bool> GameState::m_bAutoJoin( "AutoJoin", false );
@@ -1215,7 +1216,7 @@ bool GameState::HasEarnedExtraStageInternal() const
if( IsExtraStage() ) 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; return true;
} }
else if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER_FOR_EXTRA_1 ) else if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER_FOR_EXTRA_1 )