fix nonstop/oni modes (course sort was being overridden by metrics)

This commit is contained in:
Andrew Wong
2003-08-31 03:49:19 +00:00
parent 97b9061f6f
commit c02f7700d9
+8 -4
View File
@@ -389,10 +389,14 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
for( unsigned j = 0; so == SORT_INVALID && j < parts.size(); ++j )
so = StringToSongSortOrder( parts[j] );
// If we have a valid default sort in metrics, select it.
so = StringToSongSortOrder(DEFAULT_SORT);
if( so != SORT_INVALID )
GAMESTATE->m_SongSortOrder = so;
if ( !GAMESTATE->IsCourseMode() )
{
// If we have a valid default sort in metrics, select it.
// BUT ONLY IF WE ARE NOT IN COURSE MODE
so = StringToSongSortOrder(DEFAULT_SORT);
if( so != SORT_INVALID )
GAMESTATE->m_SongSortOrder = so;
}
if( so == SORT_INVALID )
so = SORT_GROUP;