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

simplify singleton registration. Add the singleton global

Browse Source 
to Lua when the singleton is constructed, and not in the
binding class.  The binding just adds the class bindings
(the same as for a non-singleton class).  This way, the
binding is available to Lua as soon as the class is constructed.
This commit is contained in:
Glenn Maynard
2006-09-21 04:20:08 +00:00
parent 8d81ef8806
commit eb376fca1d
4 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+12 -10
View File
@@ -149,6 +149,15 @@ ThemeManager::ThemeManager()
{
THEME = this; // so that we can Register THEME on construction
// Register with Lua.
{
Lua *L = LUA->Get();
lua_pushstring(L, "THEME");
this->PushSelf( L );
lua_settable( L, LUA_GLOBALSINDEX );
LUA->Release( L );
}
/* We don't have any theme loaded until SwitchThemeAndLanguage is called. */
m_sCurThemeName = "";
m_bPseudoLocalize = false;
@@ -161,6 +170,9 @@ ThemeManager::~ThemeManager()
{
g_vThemes.clear();
SAFE_DELETE( g_pLoadedThemeData );
// Unregister with Lua.
LUA->UnsetGlobal( "THEME" );
}
void ThemeManager::GetThemeNames( vector<RString>& AddTo )
@@ -1150,16 +1162,6 @@ public:
ADD_METHOD( GetNumSelectableThemes );
Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet,
// then we'll register it later when we reinit Lua just before
// initializing the display.
if( THEME )
{
lua_pushstring(L, "THEME");
THEME->PushSelf( L );
lua_settable(L, LUA_GLOBALSINDEX);
}
}
};