From fee9e51b2cbfa484f6cd88ad5f500464a34ff3bc Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 21 Jun 2005 02:41:35 +0000 Subject: [PATCH] revert. Unregister() is "atomic" (useful to call without locking around it). --- stepmania/src/LuaManager.cpp | 4 ++-- stepmania/src/LuaReference.cpp | 4 ++-- stepmania/src/LuaReference.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index b0175e8eba..c74129917c 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -204,7 +204,7 @@ void LuaManager::ResetState() if( L != NULL ) { - LuaReference::BeforeResetAll( L ); + LuaReference::BeforeResetAll(); lua_close( L ); } @@ -222,7 +222,7 @@ void LuaManager::ResetState() RegisterTypes(); - LuaReference::AfterResetAll( L ); + LuaReference::AfterResetAll(); m_pLock->Unlock(); } diff --git a/stepmania/src/LuaReference.cpp b/stepmania/src/LuaReference.cpp index fb6105ba1a..51fc7376c0 100644 --- a/stepmania/src/LuaReference.cpp +++ b/stepmania/src/LuaReference.cpp @@ -108,7 +108,7 @@ void LuaReference::Unregister() m_iReference = LUA_NOREF; } -void LuaReference::BeforeResetAll( Lua *L ) +void LuaReference::BeforeResetAll() { if( SubscriptionManager::s_pSubscribers == NULL ) return; @@ -116,7 +116,7 @@ void LuaReference::BeforeResetAll( Lua *L ) (*p)->BeforeReset(); } -void LuaReference::AfterResetAll( Lua *L ) +void LuaReference::AfterResetAll() { if( SubscriptionManager::s_pSubscribers == NULL ) return; diff --git a/stepmania/src/LuaReference.h b/stepmania/src/LuaReference.h index a20c43f2c5..cc011a77a2 100644 --- a/stepmania/src/LuaReference.h +++ b/stepmania/src/LuaReference.h @@ -32,8 +32,8 @@ public: /* Return the referenced type, or LUA_TNONE if not set. */ int GetLuaType() const; - static void BeforeResetAll( Lua *L ); // call this before resetting Lua - static void AfterResetAll( Lua *L ); // call this after resetting Lua + static void BeforeResetAll(); // call this before resetting Lua + static void AfterResetAll(); // call this after resetting Lua protected: /* If this object needs to store state to recreate itself, overload this. */