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

Cleanup. Don't return NULL when RString is expected.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-18 10:04:05 +00:00
parent cadeda01d1
commit 7f6ccd1688
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+6 -6
View File
@@ -591,7 +591,7 @@ try_element_again:
if( asElementPaths.size() == 0 ) if( asElementPaths.size() == 0 )
return NULL; // This isn't fatal. return RString(); // This isn't fatal.
FilterFileLanguages( asElementPaths ); FilterFileLanguages( asElementPaths );
@@ -725,7 +725,7 @@ try_element_again:
if( bOptional ) if( bOptional )
{ {
Cache[sFileName] = ""; Cache[sFileName] = "";
return NULL; return RString();
} }
const RString &sCategory = ElementCategoryToString(category); const RString &sCategory = ElementCategoryToString(category);
@@ -840,7 +840,7 @@ RString ThemeManager::GetMetricRaw( const IniFile &ini, const RString &sClassNam
while( true ) while( true )
{ {
RString ret; RString ret;
if( ThemeManager::GetMetricRawRecursive( ini, sClassName, sValueName, ret ) ) if( ThemeManager::GetMetricRawRecursive(ini, sClassName, sValueName, ret) )
return ret; return ret;
RString sCurMetricPath = GetMetricsIniPath( m_sCurThemeName ); RString sCurMetricPath = GetMetricsIniPath( m_sCurThemeName );
@@ -860,7 +860,7 @@ RString ThemeManager::GetMetricRaw( const IniFile &ini, const RString &sClassNam
LOG->UserLog( RageLog::LogType_ThemeMetric, sClassName + " : " + sValueName, LOG->UserLog( RageLog::LogType_ThemeMetric, sClassName + " : " + sValueName,
"could not be found in \"%s\" or \"%s\".", "could not be found in \"%s\" or \"%s\".",
sCurMetricPath.c_str(), sDefaultMetricPath.c_str() ); sCurMetricPath.c_str(), sDefaultMetricPath.c_str() );
return NULL; return RString();
default: default:
ASSERT(0); ASSERT(0);
} }
@@ -870,7 +870,7 @@ RString ThemeManager::GetMetricRaw( const IniFile &ini, const RString &sClassNam
/* Get a string metric. */ /* Get a string metric. */
RString ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName ) RString ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName )
{ {
RString sValue = GetMetricRaw(g_pLoadedThemeData->iniMetrics,sClassName,sValueName); RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName);
EvaluateString( sValue ); EvaluateString( sValue );
@@ -1037,7 +1037,7 @@ RString ThemeManager::GetString( const RString &sClassName, const RString &sValu
sValueName.Replace( "\r\n", "\\n" ); sValueName.Replace( "\r\n", "\\n" );
sValueName.Replace( "\n", "\\n" ); sValueName.Replace( "\n", "\\n" );
RString s = GetMetricRaw(g_pLoadedThemeData->iniStrings,sClassName,sValueName); RString s = GetMetricRaw( g_pLoadedThemeData->iniStrings, sClassName, sValueName );
FontCharAliases::ReplaceMarkers( s ); FontCharAliases::ReplaceMarkers( s );
// Don't EvalulateString. Strings are raw and shouldn't allow Lua. // Don't EvalulateString. Strings are raw and shouldn't allow Lua.