From e965e0b3e4ace87872fedfa54d358e6628107b3e Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 12 Jun 2011 04:09:49 -0500 Subject: [PATCH] [ScreenNetSelectMusic] Add PlayerOptionsScreen metric. --- Docs/Changelog_sm5.txt | 4 ++++ Themes/_fallback/metrics.ini | 1 + src/ScreenNetSelectMusic.cpp | 3 ++- src/ScreenNetSelectMusic.h | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 4e2237edd8..daa44ee8ac 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 Preview 2 | 20110??? -------------------------------------------------------------------------------- +2011/06/12 +---------- +* [ScreenNetSelectMusic] Add PlayerOptionsScreen metric. [AJ] + 2011/06/11 ---------- * [ScreenEdit] Allow setting the Music Preview via the Alter Menu. Just select diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index e504462b0e..77257bcb2d 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3951,6 +3951,7 @@ PrevScreen="ScreenNetRoom" NextScreen="ScreenStageInformation" NoSongsScreen=Branch.TitleMenu() RoomSelectScreen="ScreenNetRoom" +PlayerOptionsScreen="ScreenPlayerOptions" Codes="CodeDetectorOnline" ShowStyleIcon=false diff --git a/src/ScreenNetSelectMusic.cpp b/src/ScreenNetSelectMusic.cpp index c9e4aa3ea8..3397ae997b 100644 --- a/src/ScreenNetSelectMusic.cpp +++ b/src/ScreenNetSelectMusic.cpp @@ -46,6 +46,7 @@ void ScreenNetSelectMusic::Init() SAMPLE_MUSIC_PREVIEW_MODE.Load( m_sName, "SampleMusicPreviewMode" ); MUSIC_WHEEL_TYPE.Load( m_sName, "MusicWheelType" ); + PLAYER_OPTIONS_SCREEN.Load( m_sName, "PlayerOptionsScreen" ); FOREACH_EnabledPlayer (p) { @@ -331,7 +332,7 @@ void ScreenNetSelectMusic::MenuUp( const InputEventPlus &input ) { NSMAN->ReportNSSOnOff(3); GAMESTATE->m_EditMode = EditMode_Full; - SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromPlayerOptions ); + SCREENMAN->AddNewScreenToTop( PLAYER_OPTIONS_SCREEN, SM_BackFromPlayerOptions ); } void ScreenNetSelectMusic::MenuDown( const InputEventPlus &input ) diff --git a/src/ScreenNetSelectMusic.h b/src/ScreenNetSelectMusic.h index 2a0ff5fe1f..ecb89a079f 100644 --- a/src/ScreenNetSelectMusic.h +++ b/src/ScreenNetSelectMusic.h @@ -44,6 +44,7 @@ protected: RString m_sRandomMusicPath; ThemeMetric MUSIC_WHEEL_TYPE; + ThemeMetric PLAYER_OPTIONS_SCREEN; private: MusicWheel m_MusicWheel;