Experiment over, dance is the default game again.

src/GameManager.cpp

@@ -2791,8 +2791,8 @@ static const Game g_Game_Lights =
 
 static const Game *g_Games[] = 
 {
-	&g_Game_Pump,
 	&g_Game_Dance,
+	&g_Game_Pump,
 	&g_Game_KB7,
 	&g_Game_Ez2,
 	&g_Game_Para,

src/SongManager.cpp

@@ -59,7 +59,6 @@ static Preference<bool> g_bHideIncompleteCourses( "HideIncompleteCourses", false
 RString SONG_GROUP_COLOR_NAME( size_t i )   { return ssprintf( "SongGroupColor%i", (int) i+1 ); }
 RString COURSE_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "CourseGroupColor%i", (int) i+1 ); }
 
-
 SongManager::SongManager()
 {
 	// Register with Lua.
@@ -585,7 +584,6 @@ RageColor SongManager::GetCourseColor( const Course* pCourse ) const
 	if( pUE  &&  USE_UNLOCK_COLOR.GetValue() )
 		return UNLOCK_COLOR.GetValue();
 
-
 	if( USE_PREFERRED_SORT_COLOR )
 	{
 		FOREACH_CONST( CoursePointerVector, m_vPreferredCourseSort, v )
@@ -780,6 +778,7 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
 	vsCourseGroupNames.push_back( SpecialFiles::COURSES_DIR );
 	SortRStringArray( vsCourseGroupNames );
 
+	int courseIndex = 0;
 	FOREACH_CONST( RString, vsCourseGroupNames, sCourseGroup )	// for each dir in /Courses/
 	{
 		// Find all CRS files in this group directory
@@ -787,10 +786,17 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
 		GetDirListing( *sCourseGroup + "/*.crs", vsCoursePaths, false, true );
 		SortRStringArray( vsCoursePaths );
 
+		if( ld )
+		{
+			ld->SetIndeterminate( false );
+			ld->SetTotalWork( vsCoursePaths.size() );
+		}
+
 		FOREACH_CONST( RString, vsCoursePaths, sCoursePath )
 		{
 			if( ld )
 			{
+				ld->SetProgress(courseIndex);
 				ld->SetText( LOADING_COURSES.GetValue()+ssprintf("\n%s\n%s",
 					Basename(*sCourseGroup).c_str(),
 					Basename(*sCoursePath).c_str()));
@@ -806,9 +812,14 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
 			}
 
 			m_pCourses.push_back( pCourse );
+			courseIndex++;
 		}
 	}
 
+	if( ld ) {
+		ld->SetIndeterminate( true );
+	}
+
 	RefreshCourseGroupInfo();
 }