From ff2b6f697c807c7e2350b642aa46cf9de63071f2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 29 Oct 2006 20:48:02 +0000 Subject: [PATCH] PrepareExpression only used in one place and simple; merge down --- stepmania/src/LuaManager.cpp | 7 ------- stepmania/src/LuaManager.h | 3 --- stepmania/src/ThemeManager.cpp | 5 ++++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index f3e3b7c428..9dd91cce87 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -456,13 +456,6 @@ XNode *LuaHelpers::GetLuaInformation() } -void LuaHelpers::PrepareExpression( RString &sInOut ) -{ - // Remove unary +, eg. "+50"; Lua doesn't support that. - if( sInOut.size() >= 1 && sInOut[0] == '+' ) - sInOut.erase( 0, 1 ); -} - bool LuaHelpers::RunScriptFile( const RString &sFile ) { RString sScript; diff --git a/stepmania/src/LuaManager.h b/stepmania/src/LuaManager.h index 5d6614849e..e102752b22 100644 --- a/stepmania/src/LuaManager.h +++ b/stepmania/src/LuaManager.h @@ -61,9 +61,6 @@ namespace LuaHelpers bool RunScriptFile( const RString &sFile ); - /* Strip "//" comments and "+". */ - void PrepareExpression( RString &sInOut ); - /* Create a Lua array (a table with indices starting at 1) of the given vector, * and push it on the stack. */ void CreateTableFromArrayB( Lua *L, const vector &aIn ); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 2fbc4da010..6423793931 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -957,7 +957,10 @@ void ThemeManager::PushMetric( Lua *L, const RString &sClassName, const RString } else { - LuaHelpers::PrepareExpression( sValue ); + // Remove unary +, eg. "+50"; Lua doesn't support that. + if( sValue.size() >= 1 && sValue[0] == '+' ) + sValue.erase( 0, 1 ); + LuaHelpers::RunExpression( L, sValue, sName ); } }