From d98c17eac6e350321d44f7b289f29bdc52dbe226 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 22 Sep 2006 09:52:08 +0000 Subject: [PATCH] move code --- stepmania/src/ThemeManager.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index cd91ef852a..46caa3329c 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -903,16 +903,6 @@ RString ThemeManager::GetMetric( const RString &sClassName, const RString &sValu return sRet; } -void ThemeManager::EvaluateString( RString &sText ) -{ - /* If the string begins with an @, then this is a Lua expression - * that should be evaluated immediately. - * Still do font aliases on the resulting string. */ - LuaHelpers::RunAtExpressionS( sText ); - - FontCharAliases::ReplaceMarkers( sText ); -} - int ThemeManager::GetMetricI( const RString &sClassName, const RString &sValueName ) { RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName ); @@ -1009,6 +999,16 @@ apActorCommands ThemeManager::GetMetricA( const RString &sClassName, const RStri } #endif +void ThemeManager::EvaluateString( RString &sText ) +{ + /* If the string begins with an @, then this is a Lua expression + * that should be evaluated immediately. + * Still do font aliases on the resulting string. */ + LuaHelpers::RunAtExpressionS( sText ); + + FontCharAliases::ReplaceMarkers( sText ); +} + RString ThemeManager::GetNextTheme() { vector as;