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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-16 23:28:30 +00:00
parent 1e66c63774
commit 0b91c86e6f
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+1 -8
View File
@@ -130,7 +130,6 @@ try_element_again:
// Search both the current theme and the default theme dirs for this element
///////////////////////////////////////
CString path = sCurrentThemeDir;
GetDirListing( sCurrentThemeDir + "Fonts\\"+sFileName + "*",
asPossibleElementFilePaths, false, true );
@@ -144,12 +143,8 @@ try_element_again:
}
if(asPossibleElementFilePaths.empty())
{
path = sDefaultThemeDir;
GetDirListing( sDefaultThemeDir + "Fonts\\"+ sFileName + "*",
asPossibleElementFilePaths, false, true );
}
for(i = 0; i < int(asPossibleElementFilePaths.size()); ) {
if(Font::GetFontName(sFileName) != Font::GetFontName(asPossibleElementFilePaths[i]))
@@ -208,9 +203,7 @@ try_element_again:
goto try_element_again;
}
/* If we're searching for a font, the return value should be the file
* prefix we searched for; don't resolve it to the complete filename. */
return path + sAssetCategory+"\\"+sFileName;
return asPossibleElementFilePaths[0];
}
CString ThemeManager::GetPathTo( CString sAssetCategory, CString sFileName )