From 914b1f3aff12b1f753e22188cd41d1761490e909 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 20 Aug 2006 05:55:09 +0000 Subject: [PATCH] Move Extra Stage 2's difficulty cap to metrics. --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/SongManager.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index b46985fcc2..ad16297266 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2638,6 +2638,7 @@ ExtraStagePlayerOptions=1.5x,reverse ExtraStageSongOptions=norecover ExtraStage2PlayerOptions=flat,sudden,shuffle ExtraStage2SongOptions=suddendeath +ExtraStage2DifficultyMax=8 [Background] LeftEdge=SCREEN_LEFT diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index ba86fcc052..554744c85a 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -55,7 +55,7 @@ static const ThemeMetric EXTRA_STAGE_PLAYER_OPTIONS ( "SongManager", "E static const ThemeMetric EXTRA_STAGE_SONG_OPTIONS ( "SongManager", "ExtraStageSongOptions" ); static const ThemeMetric EXTRA_STAGE2_PLAYER_OPTIONS ( "SongManager", "ExtraStage2PlayerOptions" ); static const ThemeMetric EXTRA_STAGE2_SONG_OPTIONS ( "SongManager", "ExtraStage2SongOptions" ); - +static const ThemeMetric EXTRA_STAGE2_DIFFICULTY_MAX ( "SongManager", "ExtraStage2DifficultyMax" ); RString SONG_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "SongGroupColor%i", (int) i+1 ); } RString COURSE_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "CourseGroupColor%i", (int) i+1 ); } @@ -1210,8 +1210,8 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, Song*& pSong pExtra1Notes = pSteps; } - // for extra 2, we don't want to choose the hardest notes possible. So, we'll disgard Steps with meter > 8 - if( bExtra2 && pSteps->GetMeter() > 8 ) + // for extra 2, we don't want to choose the hardest notes possible. So, we'll disgard Steps with meter > 8 (assuming dance) + if( bExtra2 && pSteps->GetMeter() > EXTRA_STAGE2_DIFFICULTY_MAX ) continue; // skip if( pExtra2Notes == NULL || CompareNotesPointersForExtra(pExtra2Notes,pSteps) ) // pSteps is harder than pHardestNotes {