From f90088d616b0bda629e1f418e5d36bef3c6a29f5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 22 Sep 2006 04:35:11 +0000 Subject: [PATCH] Currently all metrics except for strings and commands are valid Lua expressions, and commands simply allow a shorthand that generates valid Lua expressions. Make strings Lua expressions. This essentially reverses strings; rather than: Metric1=Text Metric2=@Text() specify: Metric1="Text" Metric2=Text() This means that every metric (except Fallback, currently) can be treated as a Lua expression, except for Command metrics that just need a bit of preprocessing. --- stepmania/src/ThemeManager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index ae8357098a..50b16d72ff 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -888,9 +888,11 @@ RString ThemeManager::GetMetric( const RString &sClassName, const RString &sValu { RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName); - EvaluateString( sValue ); + RString sRet; + LuaHelpers::RunExpressionS( sValue, sRet ); - return sValue; + FontCharAliases::ReplaceMarkers( sRet ); + return sRet; } void ThemeManager::EvaluateString( RString &sText )