From 30d394b665240087a304a2eab64f1d750eef79b3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 21 Sep 2006 20:18:23 +0000 Subject: [PATCH] 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.) --- stepmania/src/ThemeManager.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 03e0d38202..37be13d0d9 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -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() );