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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2003-06-30 07:09:13 +00:00
parent 538b5930c3
commit 2a0972b8ba
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void GameState::Reset()
m_bChangedFailMode = false; m_bChangedFailMode = false;
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
m_PreferredDifficulty[p] = DIFFICULTY_INVALID; m_PreferredDifficulty[p] = DIFFICULTY_INVALID;
m_SongSortOrder = SORT_PREFERRED; m_SongSortOrder = SORT_INVALID;
m_PlayMode = PLAY_MODE_INVALID; m_PlayMode = PLAY_MODE_INVALID;
m_bEditing = false; m_bEditing = false;
m_bDemonstrationOrJukebox = false; m_bDemonstrationOrJukebox = false;
stepmania/src/MusicWheel.cpp
+18 -17
View File
@@ -54,6 +54,16 @@ CachedThemeMetricI NUM_WHEEL_ITEMS_METRIC ("MusicWheel","NumWheelItems");
const int MAX_WHEEL_SOUND_SPEED = 15; const int MAX_WHEEL_SOUND_SPEED = 15;
static const SongSortOrder SortOrder[] =
{
SORT_GROUP,
SORT_TITLE,
SORT_BPM,
SORT_MOST_PLAYED,
SORT_ARTIST,
SORT_INVALID
};
MusicWheel::MusicWheel() MusicWheel::MusicWheel()
{ {
@@ -140,11 +150,13 @@ MusicWheel::MusicWheel()
GAMESTATE->m_SongOptions = so; GAMESTATE->m_SongOptions = so;
} }
/* Disable SORT_PREFERRED for now, until it's implemented; right now it's not if( GAMESTATE->m_SongSortOrder == SORT_INVALID )
* very different than SORT_GROUP. Once it's implemented, enable it only {
* when no group is selected. */ if( GAMESTATE->IsCourseMode() )
if(GAMESTATE->m_SongSortOrder == SORT_PREFERRED) GAMESTATE->m_SongSortOrder = SORT_PREFERRED;
GAMESTATE->m_SongSortOrder = SORT_GROUP; else
GAMESTATE->m_SongSortOrder = SortOrder[0];
}
/* Build all of the wheel item data. Do tihs after selecting /* Build all of the wheel item data. Do tihs after selecting
* the extra stage, so it knows to always display it. */ * the extra stage, so it knows to always display it. */
@@ -517,8 +529,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
case PLAY_MODE_ENDLESS: case PLAY_MODE_ENDLESS:
{ {
// We only use SORT_PREFERRED when selecting a course // We only use SORT_PREFERRED when selecting a course
// Err, SORT_PREFERRED is skipped right now ... if( so != SongSortOrder(SORT_PREFERRED) )
if( so != SongSortOrder(SORT_GROUP /*SORT_PREFERRED*/) )
break; break;
vector<Course*> apCourses; vector<Course*> apCourses;
@@ -1022,16 +1033,6 @@ bool MusicWheel::ChangeSort( SongSortOrder new_so ) // return true if change suc
return true; return true;
} }
static const SongSortOrder SortOrder[] =
{
SORT_GROUP,
SORT_TITLE,
SORT_BPM,
SORT_MOST_PLAYED,
SORT_ARTIST,
SORT_INVALID
};
bool MusicWheel::NextSort() // return true if change successful bool MusicWheel::NextSort() // return true if change successful
{ {
/* Is the current sort in the default sort order? */ /* Is the current sort in the default sort order? */