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

Load Serialize.lua first, before calling ResetState.

Browse Source
This commit is contained in:
Glenn Maynard
2005-03-18 22:09:10 +00:00
parent 6000f7e0c9
commit a6c498610b
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+25 -17
View File
@@ -279,8 +279,32 @@ void ThemeManager::SwitchThemeAndLanguage( const CString &sThemeName, const CStr
(*p)->Read(); (*p)->Read();
} }
void ThemeManager::RunLuaScripts( const CString &sMask )
{
/* Run all script files with the given mask in Lua for all themes. Start
* from the deepest fallback theme and work outwards. */
deque<Theme>::const_iterator iter = g_vThemes.end();
do
{
--iter;
const CString &sThemeDir = GetThemeDirFromName( iter->sThemeName );
CStringArray asElementPaths;
GetDirListing( sThemeDir + "Scripts/" + sMask, asElementPaths, false, true );
for( unsigned i = 0; i < asElementPaths.size(); ++i )
{
const CString &sPath = asElementPaths[i];
LOG->Trace( "Loading \"%s\" ...", sPath.c_str() );
LUA->RunScriptFile( sPath );
}
}
while( iter != g_vThemes.begin() );
}
void ThemeManager::UpdateLuaGlobals() void ThemeManager::UpdateLuaGlobals()
{ {
/* Ugly: we need Serialize.lua to be loaded in order to be able to ResetState,
* but everything else should be able to depend on globals being set. */
RunLuaScripts( "Serialize.lua" );
LUA->ResetState(); LUA->ResetState();
/* Important: explicitly refresh cached metrics that we use. */ /* Important: explicitly refresh cached metrics that we use. */
@@ -296,23 +320,7 @@ void ThemeManager::UpdateLuaGlobals()
LUA->SetGlobal( "SCREEN_CENTER_X", (int) SCREEN_CENTER_X ); LUA->SetGlobal( "SCREEN_CENTER_X", (int) SCREEN_CENTER_X );
LUA->SetGlobal( "SCREEN_CENTER_Y", (int) SCREEN_CENTER_Y ); LUA->SetGlobal( "SCREEN_CENTER_Y", (int) SCREEN_CENTER_Y );
/* Run all script files in Lua for all themes. Start from the deepest fallback RunLuaScripts( "*.lua" );
* theme and work outwards. */
deque<Theme>::const_iterator iter = g_vThemes.end();
do
{
--iter;
const CString &sThemeDir = GetThemeDirFromName( iter->sThemeName );
CStringArray asElementPaths;
GetDirListing( sThemeDir + "Scripts/*.lua", asElementPaths, false, true );
for( unsigned i = 0; i < asElementPaths.size(); ++i )
{
const CString &sPath = asElementPaths[i];
LOG->Trace( "Loading \"%s\" ...", sPath.c_str() );
LUA->RunScriptFile( sPath );
}
}
while( iter != g_vThemes.begin() );
} }
CString ThemeManager::GetThemeDirFromName( const CString &sThemeName ) CString ThemeManager::GetThemeDirFromName( const CString &sThemeName )
stepmania/src/ThemeManager.h
+1
View File
@@ -101,6 +101,7 @@ public:
void PushSelf( lua_State *L ); void PushSelf( lua_State *L );
protected: protected:
void RunLuaScripts( const CString &sMask );
void LoadThemeRecursive( deque<Theme> &theme, const CString &sThemeName ); void LoadThemeRecursive( deque<Theme> &theme, const CString &sThemeName );
bool GetMetricRaw( const CString &sClassName, const CString &sValueName, CString &ret, int level=0 ); bool GetMetricRaw( const CString &sClassName, const CString &sValueName, CString &ret, int level=0 );
CString GetPathToAndFallback( const CString &sThemeName, ElementCategory category, const CString &sClassName, const CString &sFile ); CString GetPathToAndFallback( const CString &sThemeName, ElementCategory category, const CString &sClassName, const CString &sFile );