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

de-switch and unindent

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-12 06:03:12 +00:00
parent 3ffecaa94f
commit 4c1920474c
1 changed files with 58 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
+58 -63
View File
@@ -212,74 +212,69 @@ void ScreenOptionsMaster::RefreshIcons( int r, PlayerNumber pn )
void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM ) void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
{ {
switch( SM ) if( SM == SM_GoToNextScreen )
{ {
case SM_GoToNextScreen: //
// Override ScreenOptions's calling of ExportOptions
//
m_iChangeMask = 0;
CHECKPOINT;
for( unsigned r = 0; r < OptionRowHandlers.size(); ++r )
{ {
// CHECKPOINT_M( ssprintf("%i/%i", r, int(OptionRowHandlers.size())) );
// Override ScreenOptions's calling of ExportOptions
//
m_iChangeMask = 0;
CHECKPOINT; vector<PlayerNumber> vpns;
FOREACH_OptionsPlayer( p )
for( unsigned r = 0; r < OptionRowHandlers.size(); ++r ) vpns.push_back( p );
{ ExportOptions( r, vpns );
CHECKPOINT_M( ssprintf("%i/%i", r, int(OptionRowHandlers.size())) );
vector<PlayerNumber> vpns;
FOREACH_OptionsPlayer( p )
vpns.push_back( p );
ExportOptions( r, vpns );
}
if( m_iChangeMask & OPT_APPLY_ASPECT_RATIO )
{
THEME->UpdateLuaGlobals(); // This needs to be done before resetting the projection matrix below
SCREENMAN->ThemeChanged(); // recreate ScreenSystemLayer and SharedBGA
}
/* If the theme changes, we need to reset RageDisplay to apply new theme
* window title and icon. */
/* If the aspect ratio changes, we need to reset RageDisplay so that the
* projection matrix is re-created using the new screen dimensions. */
if( (m_iChangeMask & OPT_APPLY_THEME) ||
(m_iChangeMask & OPT_APPLY_GRAPHICS) ||
(m_iChangeMask & OPT_APPLY_ASPECT_RATIO) )
ApplyGraphicOptions();
if( m_iChangeMask & OPT_SAVE_PREFERENCES )
{
/* Save preferences. */
LOG->Trace("ROW_CONFIG used; saving ...");
PREFSMAN->SaveGlobalPrefsToDisk();
SaveGamePrefsToDisk();
}
if( m_iChangeMask & OPT_RESET_GAME )
{
ResetGame();
SCREENMAN->SetNewScreen( INITIAL_SCREEN );
m_bExportWillSetANewScreen = false;
}
if( m_iChangeMask & OPT_APPLY_SOUND )
{
SOUNDMAN->SetPrefs( PREFSMAN->GetSoundVolume() );
}
if( m_iChangeMask & OPT_APPLY_SONG )
SONGMAN->SetPreferences();
CHECKPOINT;
if( !(m_iChangeMask & OPT_RESET_GAME) )
this->GoToNextScreen();
} }
break;
default: if( m_iChangeMask & OPT_APPLY_ASPECT_RATIO )
ScreenOptions::HandleScreenMessage( SM ); {
break; THEME->UpdateLuaGlobals(); // This needs to be done before resetting the projection matrix below
SCREENMAN->ThemeChanged(); // recreate ScreenSystemLayer and SharedBGA
}
/* If the theme changes, we need to reset RageDisplay to apply new theme
* window title and icon. */
/* If the aspect ratio changes, we need to reset RageDisplay so that the
* projection matrix is re-created using the new screen dimensions. */
if( (m_iChangeMask & OPT_APPLY_THEME) ||
(m_iChangeMask & OPT_APPLY_GRAPHICS) ||
(m_iChangeMask & OPT_APPLY_ASPECT_RATIO) )
ApplyGraphicOptions();
if( m_iChangeMask & OPT_SAVE_PREFERENCES )
{
/* Save preferences. */
LOG->Trace("ROW_CONFIG used; saving ...");
PREFSMAN->SaveGlobalPrefsToDisk();
SaveGamePrefsToDisk();
}
if( m_iChangeMask & OPT_RESET_GAME )
{
ResetGame();
SCREENMAN->SetNewScreen( INITIAL_SCREEN );
m_bExportWillSetANewScreen = false;
}
if( m_iChangeMask & OPT_APPLY_SOUND )
{
SOUNDMAN->SetPrefs( PREFSMAN->GetSoundVolume() );
}
if( m_iChangeMask & OPT_APPLY_SONG )
SONGMAN->SetPreferences();
CHECKPOINT;
if( !(m_iChangeMask & OPT_RESET_GAME) )
this->GoToNextScreen();
} }
else
ScreenOptions::HandleScreenMessage( SM );
} }
/* /*