diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index d0331faefc..56ef7e21de 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -229,7 +229,7 @@ void LuaManager::PrepareExpression( CString &sInOut ) sInOut.erase( 0, 1 ); } -bool LuaManager::RunScriptFile( const CString &sFile ) +bool LuaHelpers::RunScriptFile( const CString &sFile ) { RageFile f; if( !f.Open( sFile ) ) @@ -248,7 +248,7 @@ bool LuaManager::RunScriptFile( const CString &sFile ) } CString sError; - if( !LuaHelpers::RunScript( L, sScript, sFile, sError, 0 ) ) + if( !LuaHelpers::RunScript( LUA->L, sScript, sFile, sError, 0 ) ) { sError = ssprintf( "Lua runtime error: %s", sError.c_str() ); Dialog::OK( sError, "LUA_ERROR" ); diff --git a/stepmania/src/LuaManager.h b/stepmania/src/LuaManager.h index 7458e848a3..660e072be7 100644 --- a/stepmania/src/LuaManager.h +++ b/stepmania/src/LuaManager.h @@ -56,8 +56,6 @@ public: void PrepareExpression( CString &sInOut ); // strip "//" comments and "+" - bool RunScriptFile( const CString &sFile ); - /* Reset the environment, freeing any globals left over by previously executed scripts. */ void ResetState(); @@ -97,6 +95,8 @@ namespace LuaHelpers * Returns false on error, with sError set. */ bool RunScript( Lua *L, const CString &sScript, const CString &sName, CString &sError, int iReturnValues = 0 ); + bool RunScriptFile( const CString &sFile ); + /* 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 a6492d96a8..6473850a7e 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -299,7 +299,7 @@ void ThemeManager::RunLuaScripts( const CString &sMask ) { const CString &sPath = asElementPaths[i]; LOG->Trace( "Loading \"%s\" ...", sPath.c_str() ); - LUA->RunScriptFile( sPath ); + LuaHelpers::RunScriptFile( sPath ); } } while( iter != g_vThemes.begin() );