lua cleanup

This commit is contained in:
Glenn Maynard
2005-06-15 08:26:56 +00:00
parent 52f0d9d74c
commit a88e37e7d6
3 changed files with 8 additions and 8 deletions
+3 -3
View File
@@ -85,7 +85,7 @@ public:
luaL_checktype( L, 1, LUA_TTABLE ); luaL_checktype( L, 1, LUA_TTABLE );
lua_pushvalue( L, 1 ); lua_pushvalue( L, 1 );
vector<CString> arrayTips; vector<CString> arrayTips;
LuaHelpers::ReadArrayFromTable( arrayTips, LUA->L ); LuaHelpers::ReadArrayFromTable( arrayTips, L );
lua_pop( L, 1 ); lua_pop( L, 1 );
if( lua_gettop(L) > 1 && !lua_isnil( L, 2 ) ) if( lua_gettop(L) > 1 && !lua_isnil( L, 2 ) )
@@ -109,8 +109,8 @@ public:
CStringArray arrayTips, arrayTipsAlt; CStringArray arrayTips, arrayTipsAlt;
p->GetTips( arrayTips, arrayTipsAlt ); p->GetTips( arrayTips, arrayTipsAlt );
LuaHelpers::CreateTableFromArray( arrayTips, LUA->L ); LuaHelpers::CreateTableFromArray( arrayTips, L );
LuaHelpers::CreateTableFromArray( arrayTipsAlt, LUA->L ); LuaHelpers::CreateTableFromArray( arrayTipsAlt, L );
return 2; return 2;
} }
+3 -3
View File
@@ -56,19 +56,19 @@ const char *ChunkReaderString( lua_State *L, void *ptr, size_t *size )
void LuaManager::SetGlobal( const CString &sName, int val ) void LuaManager::SetGlobal( const CString &sName, int val )
{ {
LuaHelpers::PushStack(val); LuaHelpers::PushStack( val, LUA->L );
SetGlobal( sName ); SetGlobal( sName );
} }
void LuaManager::SetGlobal( const CString &sName, bool val ) void LuaManager::SetGlobal( const CString &sName, bool val )
{ {
LuaHelpers::PushStack(val); LuaHelpers::PushStack( val, LUA->L );
SetGlobal( sName ); SetGlobal( sName );
} }
void LuaManager::SetGlobal( const CString &sName, const CString &val ) void LuaManager::SetGlobal( const CString &sName, const CString &val )
{ {
LuaHelpers::PushStack(val); LuaHelpers::PushStack( val, LUA->L );
SetGlobal( sName ); SetGlobal( sName );
} }
+2 -2
View File
@@ -722,7 +722,7 @@ public:
lua_pushvalue( LUA->L, 1 ); lua_pushvalue( LUA->L, 1 );
/* Argument 3 (pn): */ /* Argument 3 (pn): */
LuaHelpers::PushStack( (int) p ); LuaHelpers::PushStack( (int) p, LUA->L );
ASSERT( lua_gettop(LUA->L) == 6 ); /* vbSelectedOut, m_iLuaTable, function, self, arg, arg */ ASSERT( lua_gettop(LUA->L) == 6 ); /* vbSelectedOut, m_iLuaTable, function, self, arg, arg */
@@ -772,7 +772,7 @@ public:
lua_pushvalue( LUA->L, 1 ); lua_pushvalue( LUA->L, 1 );
/* Argument 3 (pn): */ /* Argument 3 (pn): */
LuaHelpers::PushStack( (int) p ); LuaHelpers::PushStack( (int) p, LUA->L );
ASSERT( lua_gettop(LUA->L) == 6 ); /* vbSelectedOut, m_iLuaTable, function, self, arg, arg */ ASSERT( lua_gettop(LUA->L) == 6 ); /* vbSelectedOut, m_iLuaTable, function, self, arg, arg */