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

I can be the merger, it's ok.

Browse Source
This commit is contained in:
AJ Kelly
2011-01-07 22:49:13 -06:00
parent e19c781991 2c9678ca65
commit fa5282cbbc
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PrefsManager.cpp
+1 -1
View File
@@ -157,7 +157,6 @@ PrefsManager::PrefsManager() :
m_sAnnouncer ( "Announcer", "" ), m_sAnnouncer ( "Announcer", "" ),
m_sTheme ( "Theme", SpecialFiles::BASE_THEME_NAME ), m_sTheme ( "Theme", SpecialFiles::BASE_THEME_NAME ),
m_sDefaultTheme ( "DefaultTheme", "default" ),
m_sDefaultModifiers ( "DefaultModifiers", "" ), m_sDefaultModifiers ( "DefaultModifiers", "" ),
m_bWindowed ( "Windowed", true ), m_bWindowed ( "Windowed", true ),
@@ -257,6 +256,7 @@ PrefsManager::PrefsManager() :
m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ), m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ),
m_sAdditionalCourseFolders ( "AdditionalCourseFolders", "" ), m_sAdditionalCourseFolders ( "AdditionalCourseFolders", "" ),
m_sAdditionalFolders ( "AdditionalFolders", "" ), m_sAdditionalFolders ( "AdditionalFolders", "" ),
m_sDefaultTheme ( "DefaultTheme", "default" ),
m_sLastSeenVideoDriver ( "LastSeenVideoDriver", "" ), m_sLastSeenVideoDriver ( "LastSeenVideoDriver", "" ),
m_sVideoRenderers ( "VideoRenderers", "" ), // StepMania.cpp sets these on first run: m_sVideoRenderers ( "VideoRenderers", "" ), // StepMania.cpp sets these on first run:
m_bSmoothLines ( "SmoothLines", false ), m_bSmoothLines ( "SmoothLines", false ),
src/ThemeManager.cpp
+19 -2
View File
@@ -97,7 +97,7 @@ void ThemeManager::Subscribe( IThemeMetric *p )
{ {
g_Subscribers.Subscribe( p ); g_Subscribers.Subscribe( p );
// It's ThemeManager's responsibility to make sure all of it's subscribers // It's ThemeManager's responsibility to make sure all of its subscribers
// are updated with current data. If a metric is created after // are updated with current data. If a metric is created after
// a theme is loaded, ThemeManager should update it right away (not just // a theme is loaded, ThemeManager should update it right away (not just
// when the theme changes). // when the theme changes).
@@ -450,11 +450,21 @@ void ThemeManager::RunLuaScripts( const RString &sMask )
{ {
/* Run all script files with the given mask in Lua for all themes. Start /* Run all script files with the given mask in Lua for all themes. Start
* from the deepest fallback theme and work outwards. */ * from the deepest fallback theme and work outwards. */
/* TODO: verify whether this final check is necessary. */
const RString sCurThemeName = m_sCurThemeName;
deque<Theme>::const_iterator iter = g_vThemes.end(); deque<Theme>::const_iterator iter = g_vThemes.end();
do do
{ {
--iter; --iter;
const RString &sThemeDir = GetThemeDirFromName( iter->sThemeName );
/* HACK: pretend to be the theme these are under by setting m_sCurThemeName
* to the name of the theme whose scripts are currently running; if those
* scripts call GetThemeName(), it'll return the theme the script is in. */
m_sCurThemeName = iter->sThemeName;
const RString &sThemeDir = GetThemeDirFromName( m_sCurThemeName );
vector<RString> asElementPaths; vector<RString> asElementPaths;
// get files from directories // get files from directories
@@ -489,6 +499,13 @@ void ThemeManager::RunLuaScripts( const RString &sMask )
} }
} }
while( iter != g_vThemes.begin() ); while( iter != g_vThemes.begin() );
/* TODO: verify whether this final check is necessary. */
if( sCurThemeName != m_sCurThemeName )
{
LOG->Warn( "ThemeManager: theme name was not restored after RunLuaScripts" );
m_sCurThemeName = sCurThemeName;
}
} }
void ThemeManager::UpdateLuaGlobals() void ThemeManager::UpdateLuaGlobals()