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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-02 22:37:19 +00:00
parent 4757ba604f
commit 6ce7d5d8c8
1 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+3 -7
View File
@@ -48,7 +48,7 @@ struct Theme
IniFile *iniMetrics; // pointer because the copy constructor isn't a deep copy IniFile *iniMetrics; // pointer because the copy constructor isn't a deep copy
}; };
// When looking for a metric or an element, search these from head to tail. // When looking for a metric or an element, search these from head to tail.
deque<Theme> g_vThemes; static deque<Theme> g_vThemes;
// //
@@ -84,7 +84,7 @@ void ThemeManager::ClearThemePathCache()
g_ThemePathCache[i].clear(); g_ThemePathCache[i].clear();
} }
void FileNameToClassAndElement( const CString &sFileName, CString &sClassNameOut, CString &sElementOut ) static void FileNameToClassAndElement( const CString &sFileName, CString &sClassNameOut, CString &sElementOut )
{ {
// split into class name and file name // split into class name and file name
int iIndexOfFirstSpace = sFileName.Find(" "); int iIndexOfFirstSpace = sFileName.Find(" ");
@@ -433,11 +433,8 @@ try_element_again:
bool bIsARedirect = GetExtension(sPath).CompareNoCase("redir")==0; bool bIsARedirect = GetExtension(sPath).CompareNoCase("redir")==0;
if( !bIsARedirect ) if( !bIsARedirect )
{
return sPath; return sPath;
}
else // bIsARedirect
{
CString sNewFileName; CString sNewFileName;
GetFileContents( sPath, sNewFileName, true ); GetFileContents( sPath, sNewFileName, true );
@@ -475,7 +472,6 @@ try_element_again:
RageException::Throw( "%s", message.c_str() ); RageException::Throw( "%s", message.c_str() );
} }
} }
}
CString ThemeManager::GetPath( ElementCategory category, const CString &sClassName_, const CString &sElement_, bool bOptional ) CString ThemeManager::GetPath( ElementCategory category, const CString &sClassName_, const CString &sElement_, bool bOptional )
{ {