diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 02836b6c6e..badaab94cb 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -40,13 +40,9 @@ ScreenTitleMenu::ScreenTitleMenu( CString sScreenName ) : void ScreenTitleMenu::Init() { - m_bSelectIsDown = false; // used by LoadHelpText which is called by ScreenWithMenuElements::Init() - ScreenSelectMaster::Init(); m_soundSelectPressed.Load( THEME->GetPathS(m_sName,"select down"), true ); - m_soundProfileChange.Load( THEME->GetPathS(m_sName,"profile change"), true ); - m_soundProfileSwap.Load( THEME->GetPathS(m_sName,"profile swap"), true ); this->SortByDrawOrder(); @@ -117,40 +113,6 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty } } - - if( MenuI.IsValid() ) - { - LoadHelpText(); - - PlayerNumber pn = MenuI.player; - - bool bSelectIsDown = false; - FOREACH_PlayerNumber( p ) - bSelectIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_SELECT) ); - if( bSelectIsDown ) - { - if( type == IET_FIRST_PRESS ) - { - switch( MenuI.button ) - { - case MENU_BUTTON_LEFT: - ChangeDefaultLocalProfile( pn, -1 ); - MESSAGEMAN->Broadcast( ssprintf("MenuLeftP%d",pn+1) ); - break; - case MENU_BUTTON_RIGHT: - ChangeDefaultLocalProfile( pn, +1 ); - MESSAGEMAN->Broadcast( ssprintf("MenuRightP%d",pn+1) ); - break; - case MENU_BUTTON_DOWN: - SwapDefaultLocalProfiles(); - break; - } - } - return; - } - } - - ScreenSelectMaster::Input( DeviceI, type, GameI, MenuI, StyleI ); } @@ -164,78 +126,6 @@ void ScreenTitleMenu::HandleMessage( const CString& sMessage ) } } -void ScreenTitleMenu::LoadHelpText() -{ - ScreenWithMenuElements::LoadHelpText(); - - bool bSelectIsDown = false; - FOREACH_PlayerNumber( p ) - bSelectIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_SELECT) ); - - if( bSelectIsDown ) - LOG->Trace( "bSelectIsDown" ); - - /* If m_soundSelectPressed isn't loaded yet, wait until it is before we do this. */ - if( m_bSelectIsDown != bSelectIsDown && m_soundSelectPressed.IsLoaded() ) - { - if( bSelectIsDown ) - m_soundSelectPressed.Play(); - - m_bSelectIsDown = bSelectIsDown; - if( bSelectIsDown ) - MESSAGEMAN->Broadcast( "SelectMenuOn" ); - else - MESSAGEMAN->Broadcast( "SelectMenuOff" ); - } -} - -void ScreenTitleMenu::ChangeDefaultLocalProfile( PlayerNumber pn, int iDir ) -{ - CString sCurrent = PREFSMAN->GetDefaultLocalProfileID(pn); - vector vsProfileID; - PROFILEMAN->GetLocalProfileIDs( vsProfileID ); - if( vsProfileID.empty() ) - return; - - int iIndex = 0; - vector::const_iterator iter = find( vsProfileID.begin(), vsProfileID.end(), sCurrent ); - if( iter != vsProfileID.end() ) - iIndex = iter - vsProfileID.begin(); - - for( int i=0; iGetNumLocalProfiles(); i++ ) - { - iIndex += iDir; - wrap( iIndex, vsProfileID.size() ); - sCurrent = vsProfileID[iIndex]; - - bool bAnyOtherIsUsingThisProfile = false; - FOREACH_PlayerNumber( p ) - { - if( p!=pn && PREFSMAN->GetDefaultLocalProfileID(p).Get() == sCurrent ) - { - bAnyOtherIsUsingThisProfile = true; - break; - } - } - if( !bAnyOtherIsUsingThisProfile ) - break; - } - - m_soundProfileChange.Play(); - - PREFSMAN->GetDefaultLocalProfileID(pn).Set( sCurrent ); -} - -void ScreenTitleMenu::SwapDefaultLocalProfiles() -{ - CString s1 = PREFSMAN->GetDefaultLocalProfileID(PLAYER_1); - CString s2 = PREFSMAN->GetDefaultLocalProfileID(PLAYER_2); - PREFSMAN->GetDefaultLocalProfileID(PLAYER_1).Set( s2 ); - PREFSMAN->GetDefaultLocalProfileID(PLAYER_2).Set( s1 ); - - m_soundProfileSwap.Play(); -} - /* * (c) 2001-2004 Chris Danford diff --git a/stepmania/src/ScreenTitleMenu.h b/stepmania/src/ScreenTitleMenu.h index e7036db953..bcf42175c9 100644 --- a/stepmania/src/ScreenTitleMenu.h +++ b/stepmania/src/ScreenTitleMenu.h @@ -17,16 +17,7 @@ public: virtual void HandleMessage( const CString& sMessage ); protected: - virtual void LoadHelpText(); - - void ChangeDefaultLocalProfile( PlayerNumber pn, int iDir ); - void SwapDefaultLocalProfiles(); - RageSound m_soundSelectPressed; - RageSound m_soundProfileChange; - RageSound m_soundProfileSwap; - - bool m_bSelectIsDown; }; #endif