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

show all courses, not just preferred

Browse Source
This commit is contained in:
Chris Danford
2006-08-15 20:14:25 +00:00
parent 45ea7b05ed
commit a894eca8ec
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+18 -6
View File
@@ -570,25 +570,37 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
case SORT_ONI_COURSES: case SORT_ONI_COURSES:
case SORT_ENDLESS_COURSES: case SORT_ENDLESS_COURSES:
{ {
vector<Course*> apCourses; bool bOnlyPreferred = PREFSMAN->m_CourseSortOrder == PrefsManager::COURSE_SOFT_PREFERRED;
vector<CourseType> vct;
switch( so ) switch( so )
{ {
case SORT_NONSTOP_COURSES: case SORT_NONSTOP_COURSES:
SONGMAN->GetPreferredSortCourses( COURSE_TYPE_NONSTOP, apCourses, PREFSMAN->m_bAutogenGroupCourses ); vct.push_back( COURSE_TYPE_NONSTOP );
break; break;
case SORT_ONI_COURSES: case SORT_ONI_COURSES:
SONGMAN->GetPreferredSortCourses( COURSE_TYPE_ONI, apCourses, PREFSMAN->m_bAutogenGroupCourses ); vct.push_back( COURSE_TYPE_ONI );
SONGMAN->GetPreferredSortCourses( COURSE_TYPE_SURVIVAL, apCourses, PREFSMAN->m_bAutogenGroupCourses ); vct.push_back( COURSE_TYPE_SURVIVAL );
break; break;
case SORT_ENDLESS_COURSES: case SORT_ENDLESS_COURSES:
SONGMAN->GetPreferredSortCourses( COURSE_TYPE_ENDLESS, apCourses, PREFSMAN->m_bAutogenGroupCourses ); vct.push_back( COURSE_TYPE_ENDLESS );
break; break;
case SORT_ALL_COURSES: case SORT_ALL_COURSES:
SONGMAN->GetAllCourses( apCourses, PREFSMAN->m_bAutogenGroupCourses ); FOREACH_ENUM2( CourseType, i )
vct.push_back( i );
break; break;
default: ASSERT(0); break; default: ASSERT(0); break;
} }
vector<Course*> apCourses;
FOREACH_CONST( CourseType, vct, ct )
{
if( bOnlyPreferred )
SONGMAN->GetPreferredSortCourses( *ct, apCourses, PREFSMAN->m_bAutogenGroupCourses );
else
SONGMAN->GetCourses( *ct, apCourses, PREFSMAN->m_bAutogenGroupCourses );
}
if( PREFSMAN->m_CourseSortOrder == PrefsManager::COURSE_SORT_SONGS ) if( PREFSMAN->m_CourseSortOrder == PrefsManager::COURSE_SORT_SONGS )
{ {
CourseUtil::SortCoursePointerArrayByDifficulty( apCourses ); CourseUtil::SortCoursePointerArrayByDifficulty( apCourses );