From 2e739bccd60d513c5401db98ce0c728e1ab614ae Mon Sep 17 00:00:00 2001 From: Josh Allen Date: Tue, 1 Aug 2006 22:04:54 +0000 Subject: [PATCH] Fix Ctrl+Letter on song wheel for all network play --- stepmania/src/ScreenNetSelectMusic.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 164bfdafde..80413db453 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -130,22 +130,24 @@ void ScreenNetSelectMusic::Input( const InputEventPlus &input ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) || (!NSMAN->useSMserver); //If we are disconnected, assume no chatting - wchar_t c = INPUTMAN->DeviceInputToChar(input.DeviceI,true); + wchar_t c = INPUTMAN->DeviceInputToChar(input.DeviceI,false); MakeUpper( &c, 1 ); if ( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) ) { - SortOrder so = GAMESTATE->m_PreferredSortOrder; - + SortOrder so = GAMESTATE->m_SortOrder; if ( ( so != SORT_TITLE ) && ( so != SORT_ARTIST ) ) + { so = SORT_TITLE; - GAMESTATE->m_PreferredSortOrder = so; - GAMESTATE->m_SortOrder.Set( so ); + GAMESTATE->m_PreferredSortOrder = so; + GAMESTATE->m_SortOrder.Set( so ); + //Odd, changing the sort order requires us to call SetOpenGroup more than once + m_MusicWheel.SetOpenGroup( ssprintf("%c", c ), so ); + } m_MusicWheel.SelectSection( ssprintf("%c", c ) ); m_MusicWheel.SetOpenGroup( ssprintf("%c", c ), so ); - m_MusicWheel.Move( +1 ); - //m_MusicWheel.Move( -1 ); + m_MusicWheel.Move(+1); } ScreenNetSelectBase::Input( input );