Remove RunAtExpressionS (@expr) for most metric types. They're evaluated

as expressions anyway.  Still used for strings and colors, which aren't.
(Strings should be, and color metrics should be removed, I think.)
This commit is contained in:
Glenn Maynard
2006-09-21 20:18:23 +00:00
parent f04a03c321
commit 30d394b665
-6
View File
@@ -907,8 +907,6 @@ int ThemeManager::GetMetricI( const RString &sClassName, const RString &sValueNa
{
RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
LuaHelpers::RunAtExpressionS( sValue );
LuaHelpers::PrepareExpression( sValue );
return LuaHelpers::RunExpressionI( sValue );
@@ -918,8 +916,6 @@ float ThemeManager::GetMetricF( const RString &sClassName, const RString &sValue
{
RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
LuaHelpers::RunAtExpressionS( sValue );
LuaHelpers::PrepareExpression( sValue );
return LuaHelpers::RunExpressionF( sValue );
@@ -930,8 +926,6 @@ bool ThemeManager::GetMetricB( const RString &sClassName, const RString &sValueN
{
RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
LuaHelpers::RunAtExpressionS( sValue );
if( sValue.Left(1) == "0" || sValue.Left(1) == "1" )
RageException::Throw( "Theme metric %s::%s: boolean value \"%s\" should be true or false",
sClassName.c_str(), sValueName.c_str(), sValue.c_str() );