actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move Extra Stage 2's difficulty cap to metrics.

Browse Source
This commit is contained in:
Jason Felds
2006-08-20 05:55:09 +00:00
parent dfee68b1d3
commit 914b1f3aff
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -2638,6 +2638,7 @@ ExtraStagePlayerOptions=1.5x,reverse
ExtraStageSongOptions=norecover ExtraStageSongOptions=norecover
ExtraStage2PlayerOptions=flat,sudden,shuffle ExtraStage2PlayerOptions=flat,sudden,shuffle
ExtraStage2SongOptions=suddendeath ExtraStage2SongOptions=suddendeath
ExtraStage2DifficultyMax=8
[Background] [Background]
LeftEdge=SCREEN_LEFT LeftEdge=SCREEN_LEFT
stepmania/src/SongManager.cpp
+3 -3
View File
@@ -55,7 +55,7 @@ static const ThemeMetric<RString> EXTRA_STAGE_PLAYER_OPTIONS ( "SongManager", "E
static const ThemeMetric<RString> EXTRA_STAGE_SONG_OPTIONS ( "SongManager", "ExtraStageSongOptions" ); static const ThemeMetric<RString> EXTRA_STAGE_SONG_OPTIONS ( "SongManager", "ExtraStageSongOptions" );
static const ThemeMetric<RString> EXTRA_STAGE2_PLAYER_OPTIONS ( "SongManager", "ExtraStage2PlayerOptions" ); static const ThemeMetric<RString> EXTRA_STAGE2_PLAYER_OPTIONS ( "SongManager", "ExtraStage2PlayerOptions" );
static const ThemeMetric<RString> EXTRA_STAGE2_SONG_OPTIONS ( "SongManager", "ExtraStage2SongOptions" ); static const ThemeMetric<RString> EXTRA_STAGE2_SONG_OPTIONS ( "SongManager", "ExtraStage2SongOptions" );
static const ThemeMetric<int> EXTRA_STAGE2_DIFFICULTY_MAX ( "SongManager", "ExtraStage2DifficultyMax" );
RString SONG_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "SongGroupColor%i", (int) i+1 ); } 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 ); } 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; pExtra1Notes = pSteps;
} }
// for extra 2, we don't want to choose the hardest notes possible. So, we'll disgard Steps with meter > 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() > 8 ) if( bExtra2 && pSteps->GetMeter() > EXTRA_STAGE2_DIFFICULTY_MAX )
continue; // skip continue; // skip
if( pExtra2Notes == NULL || CompareNotesPointersForExtra(pExtra2Notes,pSteps) ) // pSteps is harder than pHardestNotes if( pExtra2Notes == NULL || CompareNotesPointersForExtra(pExtra2Notes,pSteps) ) // pSteps is harder than pHardestNotes
{ {