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

merge ResetState into ctor

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-20 23:47:08 +00:00
parent ab1fd34e76
commit 1749779ca8
2 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+25 -29
View File
@@ -192,7 +192,31 @@ LuaManager::LuaManager()
L = NULL;
m_pLock = new RageMutex( "Lua" );
ResetState();
m_pLock->Lock();
if( L != NULL )
{
LuaReference::BeforeResetAll();
lua_close( L );
}
L = lua_open();
ASSERT( L );
lua_atpanic( L, LuaPanic );
luaopen_base( L );
luaopen_math( L );
luaopen_string( L );
luaopen_table( L );
lua_settop(L, 0); // luaopen_* pushes stuff onto the stack that we don't need
RegisterTypes();
LuaReference::AfterResetAll();
m_pLock->Unlock();
}
LuaManager::~LuaManager()
@@ -245,34 +269,6 @@ void LuaManager::RegisterTypes()
}
}
void LuaManager::ResetState()
{
m_pLock->Lock();
if( L != NULL )
{
LuaReference::BeforeResetAll();
lua_close( L );
}
L = lua_open();
ASSERT( L );
lua_atpanic( L, LuaPanic );
luaopen_base( L );
luaopen_math( L );
luaopen_string( L );
luaopen_table( L );
lua_settop(L, 0); // luaopen_* pushes stuff onto the stack that we don't need
RegisterTypes();
LuaReference::AfterResetAll();
m_pLock->Unlock();
}
namespace
{