[ScreenNetSelectMusic] Add PlayerOptionsScreen metric.

This commit is contained in:
AJ Kelly
2011-06-12 04:09:49 -05:00
parent 4036ee89c2
commit e965e0b3e4
4 changed files with 8 additions and 1 deletions
+4
View File
@@ -8,6 +8,10 @@ ________________________________________________________________________________
StepMania 5.0 Preview 2 | 20110??? StepMania 5.0 Preview 2 | 20110???
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
2011/06/12
----------
* [ScreenNetSelectMusic] Add PlayerOptionsScreen metric. [AJ]
2011/06/11 2011/06/11
---------- ----------
* [ScreenEdit] Allow setting the Music Preview via the Alter Menu. Just select * [ScreenEdit] Allow setting the Music Preview via the Alter Menu. Just select
+1
View File
@@ -3951,6 +3951,7 @@ PrevScreen="ScreenNetRoom"
NextScreen="ScreenStageInformation" NextScreen="ScreenStageInformation"
NoSongsScreen=Branch.TitleMenu() NoSongsScreen=Branch.TitleMenu()
RoomSelectScreen="ScreenNetRoom" RoomSelectScreen="ScreenNetRoom"
PlayerOptionsScreen="ScreenPlayerOptions"
Codes="CodeDetectorOnline" Codes="CodeDetectorOnline"
ShowStyleIcon=false ShowStyleIcon=false
+2 -1
View File
@@ -46,6 +46,7 @@ void ScreenNetSelectMusic::Init()
SAMPLE_MUSIC_PREVIEW_MODE.Load( m_sName, "SampleMusicPreviewMode" ); SAMPLE_MUSIC_PREVIEW_MODE.Load( m_sName, "SampleMusicPreviewMode" );
MUSIC_WHEEL_TYPE.Load( m_sName, "MusicWheelType" ); MUSIC_WHEEL_TYPE.Load( m_sName, "MusicWheelType" );
PLAYER_OPTIONS_SCREEN.Load( m_sName, "PlayerOptionsScreen" );
FOREACH_EnabledPlayer (p) FOREACH_EnabledPlayer (p)
{ {
@@ -331,7 +332,7 @@ void ScreenNetSelectMusic::MenuUp( const InputEventPlus &input )
{ {
NSMAN->ReportNSSOnOff(3); NSMAN->ReportNSSOnOff(3);
GAMESTATE->m_EditMode = EditMode_Full; GAMESTATE->m_EditMode = EditMode_Full;
SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromPlayerOptions ); SCREENMAN->AddNewScreenToTop( PLAYER_OPTIONS_SCREEN, SM_BackFromPlayerOptions );
} }
void ScreenNetSelectMusic::MenuDown( const InputEventPlus &input ) void ScreenNetSelectMusic::MenuDown( const InputEventPlus &input )
+1
View File
@@ -44,6 +44,7 @@ protected:
RString m_sRandomMusicPath; RString m_sRandomMusicPath;
ThemeMetric<RString> MUSIC_WHEEL_TYPE; ThemeMetric<RString> MUSIC_WHEEL_TYPE;
ThemeMetric<RString> PLAYER_OPTIONS_SCREEN;
private: private:
MusicWheel m_MusicWheel; MusicWheel m_MusicWheel;