From a894eca8ecdf3514a46f56c61c718c3943e1125b Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 15 Aug 2006 20:14:25 +0000
Subject: [PATCH] show all courses, not just preferred

---
 stepmania/src/MusicWheel.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 62c500e443..5d485922f4 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -570,25 +570,37 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
 	case SORT_ONI_COURSES:
 	case SORT_ENDLESS_COURSES:
 		{
-			vector<Course*> apCourses;
+			bool bOnlyPreferred = PREFSMAN->m_CourseSortOrder == PrefsManager::COURSE_SOFT_PREFERRED;
+
+			vector<CourseType> vct;
 			switch( so )
 			{
 			case SORT_NONSTOP_COURSES:
-				SONGMAN->GetPreferredSortCourses( COURSE_TYPE_NONSTOP,	apCourses, PREFSMAN->m_bAutogenGroupCourses );
+				vct.push_back( COURSE_TYPE_NONSTOP );
 				break;
 			case SORT_ONI_COURSES:
-				SONGMAN->GetPreferredSortCourses( COURSE_TYPE_ONI,	apCourses, PREFSMAN->m_bAutogenGroupCourses );
-				SONGMAN->GetPreferredSortCourses( COURSE_TYPE_SURVIVAL,	apCourses, PREFSMAN->m_bAutogenGroupCourses );
+				vct.push_back( COURSE_TYPE_ONI );
+				vct.push_back( COURSE_TYPE_SURVIVAL );
 				break;
 			case SORT_ENDLESS_COURSES:
-				SONGMAN->GetPreferredSortCourses( COURSE_TYPE_ENDLESS,	apCourses, PREFSMAN->m_bAutogenGroupCourses );
+				vct.push_back( COURSE_TYPE_ENDLESS );
 				break;
 			case SORT_ALL_COURSES:
-				SONGMAN->GetAllCourses( apCourses, PREFSMAN->m_bAutogenGroupCourses );
+				FOREACH_ENUM2( CourseType, i )
+					vct.push_back( i );
 				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 )
 			{
 				CourseUtil::SortCoursePointerArrayByDifficulty( apCourses );