From 0d3c9f8e06995a70c3255d32b5c157bc168774c1 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Mon, 7 Aug 2006 01:53:58 +0000 Subject: [PATCH] Allow themes to specify extra stage player and song options. --- stepmania/src/SongManager.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index f03a4a849d..9755bcbdf4 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -50,6 +50,10 @@ static const ThemeMetric USE_PREFERRED_SORT_COLOR ( "SongManager", "UsePr static const ThemeMetric USE_UNLOCK_COLOR ( "SongManager", "UseUnlockColor" ); static const ThemeMetric UNLOCK_COLOR ( "SongManager", "UnlockColor" ); static const ThemeMetric MOVE_UNLOCKS_TO_BOTTOM_OF_PREFERRED_SORT ( "SongManager", "MoveUnlocksToBottomOfPreferredSort" ); +static const ThemeMetric EXTRA_STAGE_PLAYER_OPTIONS ( "SongManager", "ExtraStagePlayerOptions" ); +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" ); RString SONG_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "SongGroupColor%i", (int) i+1 ); } @@ -1218,15 +1222,13 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, Song*& pSong { pPlayerOptionsOut->Init(); pPlayerOptionsOut->m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME; - pPlayerOptionsOut->m_fScrolls[PlayerOptions::SCROLL_REVERSE] = 1; - pPlayerOptionsOut->m_fScrollSpeed = 1.5f; - pPlayerOptionsOut->m_fDark = 1; + pPlayerOptionsOut->FromString( bExtra2 ? EXTRA_STAGE2_PLAYER_OPTIONS : EXTRA_STAGE_PLAYER_OPTIONS, true ); } if( pSongOptionsOut != NULL ) { pSongOptionsOut->Init(); - pSongOptionsOut->m_DrainType = (bExtra2 ? SongOptions::DRAIN_SUDDEN_DEATH : SongOptions::DRAIN_NO_RECOVER); + pSongOptionsOut->FromString( bExtra2 ? EXTRA_STAGE2_SONG_OPTIONS : EXTRA_STAGE_SONG_OPTIONS ); } }