This commit is contained in:
Glenn Maynard
2006-10-15 07:16:57 +00:00
parent df90e4f4c2
commit 84edde11b8
+22 -21
View File
@@ -683,35 +683,36 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
vsCourseDirs.push_back( COURSES_DIR ); vsCourseDirs.push_back( COURSES_DIR );
vsCourseDirs.push_back( ADDITIONAL_COURSES_DIR ); vsCourseDirs.push_back( ADDITIONAL_COURSES_DIR );
vector<RString> vsCourseGroupNames;
FOREACH_CONST( RString, vsCourseDirs, sDir ) FOREACH_CONST( RString, vsCourseDirs, sDir )
{ {
// Find all group directories in Courses dir // Find all group directories in Courses dir
vector<RString> vsCourseGroupNames;
GetDirListing( *sDir + "*", vsCourseGroupNames, true, true ); GetDirListing( *sDir + "*", vsCourseGroupNames, true, true );
StripCvs( vsCourseGroupNames ); StripCvs( vsCourseGroupNames );
SortRStringArray( vsCourseGroupNames ); }
FOREACH_CONST( RString, vsCourseGroupNames, sCourseGroup ) // for each dir in /Courses/ SortRStringArray( vsCourseGroupNames );
FOREACH_CONST( RString, vsCourseGroupNames, sCourseGroup ) // for each dir in /Courses/
{
// Find all CRS files in this group directory
vector<RString> vsCoursePaths;
GetDirListing( *sCourseGroup + "/*.crs", vsCoursePaths, false, true );
SortRStringArray( vsCoursePaths );
FOREACH_CONST( RString, vsCoursePaths, sCoursePath )
{ {
// Find all CRS files in this group directory if( ld )
vector<RString> vsCoursePaths;
GetDirListing( *sCourseGroup + "/*.crs", vsCoursePaths, false, true );
SortRStringArray( vsCoursePaths );
FOREACH_CONST( RString, vsCoursePaths, sCoursePath )
{ {
if( ld ) ld->SetText( LOADING_COURSES.GetValue()+ssprintf("\n%s\n%s",
{ Basename(*sCourseGroup).c_str(),
ld->SetText( LOADING_COURSES.GetValue()+ssprintf("\n%s\n%s", Basename(*sCoursePath).c_str()));
Basename(*sCourseGroup).c_str(), ld->Paint();
Basename(*sCoursePath).c_str()));
ld->Paint();
}
Course* pCourse = new Course;
CourseLoaderCRS::LoadFromCRSFile( *sCoursePath, *pCourse );
m_pCourses.push_back( pCourse );
} }
Course* pCourse = new Course;
CourseLoaderCRS::LoadFromCRSFile( *sCoursePath, *pCourse );
m_pCourses.push_back( pCourse );
} }
} }