From 5f7877b6b38e8ff250085d53c47ae165dc0e900c Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Sat, 21 Jun 2008 04:04:59 +0000 Subject: [PATCH] Take the Player Options menu from ScreenNetSelectMusic, have it use Select instead of Up. --- stepmania/src/ScreenSelectMusic.cpp | 10 ++++++++++ stepmania/src/ScreenSelectMusic.h | 1 + 2 files changed, 11 insertions(+) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 12cf31e486..211b51405a 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -45,6 +45,7 @@ AutoScreenMessage( SM_AllowOptionsMenuRepeat ) AutoScreenMessage( SM_SongChanged ) AutoScreenMessage( SM_SortOrderChanging ) AutoScreenMessage( SM_SortOrderChanged ) +AutoScreenMessage( SM_BackFromPlayerOptions ) static RString g_sCDTitlePath; static bool g_bWantFallbackCdTitle; @@ -75,6 +76,7 @@ void ScreenSelectMusic::Init() SELECT_MENU_AVAILABLE.Load( m_sName, "SelectMenuAvailable" ); MODE_MENU_AVAILABLE.Load( m_sName, "ModeMenuAvailable" ); USE_OPTIONS_LIST.Load( m_sName, "UseOptionsList" ); + USE_PLAYER_SELECT_MENU.Load( m_sName, "UsePlayerSelectMenu" ); TWO_PART_SELECTION.Load( m_sName, "TwoPartSelection" ); m_GameButtonPreviousSong = INPUTMAPPER->GetInputScheme()->ButtonNameToIndex( THEME->GetMetric(m_sName,"PreviousSongButton") ); @@ -398,6 +400,14 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) m_bStepsChosen[input.pn] ) return; // ignore + if( USE_PLAYER_SELECT_MENU ) + { + if( input.type == IET_RELEASE && input.MenuI == GAME_BUTTON_SELECT ) + { + GAMESTATE->m_EditMode = EditMode_Full; + SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromPlayerOptions ); + } + } // handle options list input if( USE_OPTIONS_LIST ) diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 81d4211971..48f80220e8 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -82,6 +82,7 @@ protected: ThemeMetric SELECT_MENU_AVAILABLE; ThemeMetric MODE_MENU_AVAILABLE; ThemeMetric USE_OPTIONS_LIST; + ThemeMetric USE_PLAYER_SELECT_MENU; ThemeMetric TWO_PART_SELECTION; bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; }