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

cleanup

Browse Source
This commit is contained in:
AJ Kelly
2011-02-19 23:38:44 -06:00
parent 30ec5bc855
commit 1ea45319f2
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsMaster.cpp
+8 -10
View File
@@ -16,12 +16,11 @@
#include "CommonMetrics.h" #include "CommonMetrics.h"
#include "GameLoop.h" #include "GameLoop.h"
#define LINE_NAMES THEME->GetMetric (m_sName,"LineNames") #define LINE_NAMES THEME->GetMetric (m_sName,"LineNames")
#define LINE(sLineName) THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str())) #define LINE(sLineName) THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))
#define FORCE_ALL_PLAYERS THEME->GetMetricB(m_sName,"ForceAllPlayers") #define FORCE_ALL_PLAYERS THEME->GetMetricB(m_sName,"ForceAllPlayers")
#define INPUT_MODE THEME->GetMetric (m_sName,"InputMode") #define INPUT_MODE THEME->GetMetric (m_sName,"InputMode")
#define NAVIGATION_MODE THEME->GetMetric (m_sName,"NavigationMode") #define NAVIGATION_MODE THEME->GetMetric (m_sName,"NavigationMode")
REGISTER_SCREEN_CLASS( ScreenOptionsMaster ); REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
@@ -65,7 +64,6 @@ void ScreenOptionsMaster::Init()
ASSERT( OptionRowHandlers.size() == asLineNames.size() ); ASSERT( OptionRowHandlers.size() == asLineNames.size() );
InitMenu( OptionRowHandlers ); InitMenu( OptionRowHandlers );
} }
@@ -109,9 +107,9 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
if( m_iChangeMask & OPT_APPLY_ASPECT_RATIO ) if( m_iChangeMask & OPT_APPLY_ASPECT_RATIO )
{ {
THEME->UpdateLuaGlobals(); // This needs to be done before resetting the projection matrix below THEME->UpdateLuaGlobals(); // This needs to be done before resetting the projection matrix below
THEME->ReloadSubscribers(); // SCREEN_* has changed, so re-read all subscribing ThemeMetrics THEME->ReloadSubscribers(); // SCREEN_* has changed, so re-read all subscribing ThemeMetrics
SCREENMAN->ThemeChanged(); // recreate ScreenSystemLayer and SharedBGA SCREENMAN->ThemeChanged(); // recreate ScreenSystemLayer and SharedBGA
} }
/* If the theme changes, we need to reset RageDisplay to apply the new window /* If the theme changes, we need to reset RageDisplay to apply the new window
@@ -131,7 +129,7 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
if( m_iChangeMask & OPT_SAVE_PREFERENCES ) if( m_iChangeMask & OPT_SAVE_PREFERENCES )
{ {
/* Save preferences. */ // Save preferences.
LOG->Trace("ROW_CONFIG used; saving ..."); LOG->Trace("ROW_CONFIG used; saving ...");
PREFSMAN->SavePrefsToDisk(); PREFSMAN->SavePrefsToDisk();
} }