From a03eba0767b6644c70c3e5e70d869277b25ba856 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Sep 2005 00:07:53 +0000 Subject: [PATCH] cleanup --- stepmania/src/ThemeManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 7fb5239ba3..457f2fab45 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -443,28 +443,28 @@ try_element_again: } } -CString ThemeManager::GetPathToAndFallback( const CString &sThemeName, ElementCategory category, const CString &sClassName, const CString &sElement ) +CString ThemeManager::GetPathToAndFallback( const CString &sThemeName, ElementCategory category, const CString &sClassName_, const CString &sElement ) { - CString sClass = sClassName; + CString sClassName = sClassName_; int n = 100; while( n-- ) { // search with requested name - CString sRet = GetPathToRaw( sThemeName, category, sClass, sElement ); + CString sRet = GetPathToRaw( sThemeName, category, sClassName, sElement ); if( !sRet.empty() ) return sRet; // search fallback name (if any) CString sFallback; - GetMetricRawRecursive( sClass, "Fallback", sFallback ); + GetMetricRawRecursive( sClassName, "Fallback", sFallback ); if( sFallback.empty() ) return NULL; - sClass = sFallback; + sClassName = sFallback; } RageException::Throw("Infinite recursion looking up theme element from theme \"%s\", class \"%s\"", - sThemeName.c_str(), sClass.c_str() ); + sThemeName.c_str(), sClassName.c_str() ); } CString ThemeManager::GetPath( ElementCategory category, const CString &sClassName_, const CString &sElement_, bool bOptional )