fixed ThemeManager using element in base theme instead of current theme if base theme has a redir, simplifed a few sound element names.

This commit is contained in:
Chris Danford
2003-01-26 21:45:13 +00:00
parent 5a7b10e989
commit 229aa2cae9
6 changed files with 57 additions and 63 deletions
+12 -10
View File
@@ -116,18 +116,20 @@ ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking","ranking")
}
}
vector<CString> asCoursePaths;
split( COURSES_TO_SHOW, ",", asCoursePaths, true );
for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
{
for( unsigned c=0; c<asCoursePaths.size(); c++ )
vector<CString> asCoursePaths;
split( COURSES_TO_SHOW, ",", asCoursePaths, true );
for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
{
PageToShow pts;
pts.type = PageToShow::TYPE_COURSE;
pts.nt = aNotesTypesToShow[i];
pts.pCourse = SONGMAN->GetCourseFromPath( asCoursePaths[c] );
if( pts.pCourse )
m_vPagesToShow.push_back( pts );
for( unsigned c=0; c<asCoursePaths.size(); c++ )
{
PageToShow pts;
pts.type = PageToShow::TYPE_COURSE;
pts.nt = aNotesTypesToShow[i];
pts.pCourse = SONGMAN->GetCourseFromPath( asCoursePaths[c] );
if( pts.pCourse )
m_vPagesToShow.push_back( pts );
}
}
}