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

better function registration: store a reference, instead of making up a name

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-05 23:03:20 +00:00
parent 33661c13d6
commit a4de4c8c0d
5 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+12 -3
View File
@@ -59,6 +59,13 @@ void LuaManager::PushStackNil()
lua_pushnil( L );
}
void LuaManager::PushNopFunction()
{
lua_rawgeti( LUA->L, LUA_REGISTRYINDEX, m_iNopFunction );
ASSERT_M( !lua_isnil(L, -1), ssprintf("%i", m_iNopFunction) )
}
void LuaManager::PushStack( int out, lua_State *L )
{
if( L == NULL )
@@ -185,7 +192,9 @@ void LuaManager::ResetState()
luaopen_string( L );
lua_settop(L, 0); // luaopen_* pushes stuff onto the stack that we don't need
RunScript( "nop = function(self) end" );
/* Set up the NOP function pointer. */
RunScript( "return function() end", 1 );
m_iNopFunction = luaL_ref( L, LUA_REGISTRYINDEX );
for( const LuaFunctionList *p = g_LuaFunctions; p; p=p->next )
lua_register( L, p->name, p->func );
@@ -235,7 +244,7 @@ bool LuaManager::RunScriptFile( const CString &sFile )
return RunScript( sScript );
}
bool LuaManager::RunScript( const CString &sScript )
bool LuaManager::RunScript( const CString &sScript, int iReturnValues )
{
// load string
{
@@ -257,7 +266,7 @@ bool LuaManager::RunScript( const CString &sScript )
// evaluate
{
int ret = lua_pcall(L, 0, 0, 0);
int ret = lua_pcall( L, 0, iReturnValues, 0 );
if( ret )
{
CString err;