From f9496f96d969f2189446d525db8e1fe079891ed4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 29 Oct 2006 20:52:25 +0000 Subject: [PATCH] remove another specialized "parse and evaluate string" --- stepmania/src/LuaManager.cpp | 11 ----------- stepmania/src/LuaManager.h | 3 --- stepmania/src/ThemeManager.cpp | 6 +++++- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index 9dd91cce87..bd6555f766 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -523,17 +523,6 @@ bool LuaHelpers::RunExpression( Lua *L, const RString &sExpression, const RStrin return true; } -void LuaHelpers::RunExpressionS( const RString &str, RString &sOut ) -{ - Lua *L = LUA->Get(); - - RunExpression( L, str ); - - LuaHelpers::Pop( L, sOut ); - - LUA->Release( L ); -} - void LuaHelpers::ParseCommandList( Lua *L, const RString &sCommands, const RString &sName ) { RString sLuaFunction; diff --git a/stepmania/src/LuaManager.h b/stepmania/src/LuaManager.h index e102752b22..c19afa69cb 100644 --- a/stepmania/src/LuaManager.h +++ b/stepmania/src/LuaManager.h @@ -72,9 +72,6 @@ namespace LuaHelpers /* Read the table at the top of the stack back into a vector. */ void ReadArrayFromTableB( Lua *L, vector &aOut ); - /* Run an expression in the global environment, returning the given type. */ - void RunExpressionS( const RString &str, RString &sOut ); - void ParseCommandList( lua_State *L, const RString &sCommands, const RString &sName ); XNode *GetLuaInformation(); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 6423793931..77dbf5a797 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -827,8 +827,12 @@ RString ThemeManager::GetClassFallback( const RString &sClassName ) if( !GetMetricRawRecursive(g_pLoadedThemeData->iniMetrics,sClassName,"Fallback",sFallback) ) return RString(); + Lua *L = LUA->Get(); + LuaHelpers::RunExpression( L, sFallback ); RString sRet; - LuaHelpers::RunExpressionS( sFallback, sRet ); + LuaHelpers::Pop( L, sRet ); + LUA->Release( L ); + return sRet; }