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

split SORT_MENU into SORT_SORT_MENU and SORT_MODE_MENU

Browse Source
This commit is contained in:
Chris Danford
2004-01-11 08:15:44 +00:00
parent f2769a19b5
commit 5b08f9dae2
8 changed files with 75 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+15 -4
View File
@@ -597,9 +597,12 @@ void ScreenSelectMusic::TweenScoreOnAndOffAfterChangeSort()
case SORT_ENDLESS_COURSES:
EnterCourseDisplayMode();
break;
case SORT_SORT_MENU:
case SORT_MODE_MENU:
// do nothing
break;
default:
if( GAMESTATE->m_SongSortOrder != SORT_MENU )
ExitCourseDisplayMode();
ExitCourseDisplayMode();
break;
}
}
@@ -708,12 +711,20 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
HarderDifficulty( pn );
return;
}
if( CodeDetector::EnteredMenu(GameI.controller) )
if( CodeDetector::EnteredSortMenu(GameI.controller) )
{
if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
m_soundLocked.Play();
else
m_MusicWheel.ChangeSort( SORT_MENU );
m_MusicWheel.ChangeSort( SORT_SORT_MENU );
return;
}
if( CodeDetector::EnteredModeMenu(GameI.controller) )
{
if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
m_soundLocked.Play();
else
m_MusicWheel.ChangeSort( SORT_MODE_MENU );
return;
}
if( CodeDetector::EnteredNextSort(GameI.controller) )