actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make Ctrl+[letter] work as expected in Artist sort. original code by midiman, simplified by AJ; fixes issue 172.

Browse Source
This commit is contained in:
AJ Kelly
2010-08-26 17:48:00 -05:00
parent f639459039
commit 62e4cac758
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSelectMusic.cpp
+18 -15
View File
@@ -399,16 +399,17 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
if( !m_MusicWheel.WheelIsLocked() && !GAMESTATE->IsCourseMode() ) if( !m_MusicWheel.WheelIsLocked() && !GAMESTATE->IsCourseMode() )
{ {
SortOrder so = GAMESTATE->m_SortOrder; SortOrder so = GAMESTATE->m_SortOrder;
if ( ( so != SORT_TITLE ) && ( so != SORT_ARTIST ) ) // When in Artist sort, this means first letter of the artist.
{ // Otherwise, if not in Title sort already, switch to Title sort.
if ( so != SORT_ARTIST )
so = SORT_TITLE; so = SORT_TITLE;
GAMESTATE->m_PreferredSortOrder = so; GAMESTATE->m_PreferredSortOrder = so;
GAMESTATE->m_SortOrder.Set( so ); GAMESTATE->m_SortOrder.Set( so );
// Odd, changing the sort order requires us to call SetOpenSection more than once // Odd, changing the sort order requires us to call SetOpenSection more than once
m_MusicWheel.ChangeSort( so ); m_MusicWheel.ChangeSort( so );
m_MusicWheel.SetOpenSection( ssprintf("%c", c ) ); m_MusicWheel.SetOpenSection( ssprintf("%c", c ) );
}
m_MusicWheel.SelectSection( ssprintf("%c", c ) ); m_MusicWheel.SelectSection( ssprintf("%c", c ) );
m_MusicWheel.ChangeSort( so ); m_MusicWheel.ChangeSort( so );
m_MusicWheel.SetOpenSection( ssprintf("%c", c ) ); m_MusicWheel.SetOpenSection( ssprintf("%c", c ) );
@@ -657,8 +658,9 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
} }
} }
} }
// Actually I don't like to just copy and paste code because it may go wrong
// if something goes overlooked -DaisuMaster // Actually I don't like to just copy and paste code because it may go
// wrong if something goes overlooked -DaisuMaster
if( CHANGE_GROUPS_WITH_GAME_BUTTONS ) if( CHANGE_GROUPS_WITH_GAME_BUTTONS )
{ {
if( input.type != IET_FIRST_PRESS) if( input.type != IET_FIRST_PRESS)
@@ -875,7 +877,7 @@ bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )
RString sNewGroup = m_MusicWheel.JumpToNextGroup(); RString sNewGroup = m_MusicWheel.JumpToNextGroup();
m_MusicWheel.SelectSection(sNewGroup); m_MusicWheel.SelectSection(sNewGroup);
m_MusicWheel.SetOpenSection(sNewGroup); m_MusicWheel.SetOpenSection(sNewGroup);
MESSAGEMAN->Broadcast("PreviousGroup"); MESSAGEMAN->Broadcast("NextGroup");
AfterMusicChange(); AfterMusicChange();
} }
} }
@@ -888,7 +890,7 @@ bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )
RString sNewGroup = m_MusicWheel.JumpToPrevGroup(); RString sNewGroup = m_MusicWheel.JumpToPrevGroup();
m_MusicWheel.SelectSection(sNewGroup); m_MusicWheel.SelectSection(sNewGroup);
m_MusicWheel.SetOpenSection(sNewGroup); m_MusicWheel.SetOpenSection(sNewGroup);
MESSAGEMAN->Broadcast("NextGroup"); MESSAGEMAN->Broadcast("PreviousGroup");
AfterMusicChange(); AfterMusicChange();
} }
} }
@@ -1456,8 +1458,8 @@ void ScreenSelectMusic::MenuBack( const InputEventPlus &input )
{ {
// Handle unselect song (ffff) // Handle unselect song (ffff)
// todo: this isn't right at all. -aj // todo: this isn't right at all. -aj
// temporal: deactivating this for the time being -DaisuMaster /*
/*if( m_SelectionState == SelectionState_SelectingSteps && !m_bStepsChosen[input.pn] && input.MenuI == GAME_BUTTON_BACK && input.type == IET_FIRST_PRESS ) if( m_SelectionState == SelectionState_SelectingSteps && !m_bStepsChosen[input.pn] && input.MenuI == GAME_BUTTON_BACK && input.type == IET_FIRST_PRESS )
{ {
// if a player has chosen their steps already, don't unchoose song. // if a player has chosen their steps already, don't unchoose song.
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
@@ -1469,7 +1471,8 @@ void ScreenSelectMusic::MenuBack( const InputEventPlus &input )
MESSAGEMAN->Broadcast( msg ); MESSAGEMAN->Broadcast( msg );
m_SelectionState = SelectionState_SelectingSong; m_SelectionState = SelectionState_SelectingSong;
return; return;
}*/ }
*/
m_BackgroundLoader.Abort(); m_BackgroundLoader.Abort();