actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass error handler to lua_pcall

Browse Source
This commit is contained in:
Glenn Maynard
2007-01-14 00:25:40 +00:00
parent dd5baec8a5
commit 271dfafc8d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+7 -1
View File
@@ -628,6 +628,9 @@ bool LuaHelpers::RunScriptFile( const RString &sFile )
bool LuaHelpers::RunScript( Lua *L, const RString &sScript, const RString &sName, RString &sError, int iArgs, int iReturnValues )
{
lua_pushcfunction( L, GetLuaStack );
int iErrFunc = lua_gettop( L );
// load string
{
int ret = luaL_loadbuffer( L, sScript.data(), sScript.size(), sName );
@@ -635,6 +638,7 @@ bool LuaHelpers::RunScript( Lua *L, const RString &sScript, const RString &sName
{
LuaHelpers::Pop( L, sError );
lua_pop( L, iArgs );
lua_remove( L, iErrFunc );
for( int i = 0; i < iReturnValues; ++i )
lua_pushnil( L );
return false;
@@ -646,16 +650,18 @@ bool LuaHelpers::RunScript( Lua *L, const RString &sScript, const RString &sName
// evaluate
{
int ret = lua_pcall( L, iArgs, iReturnValues, 0 );
int ret = lua_pcall( L, iArgs, iReturnValues, iErrFunc );
if( ret )
{
LuaHelpers::Pop( L, sError );
lua_remove( L, iErrFunc );
for( int i = 0; i < iReturnValues; ++i )
lua_pushnil( L );
return false;
}
}
lua_remove( L, iErrFunc );
return true;
}