From cecaf0c9bea432b4c54e60d455c768fead442b19 Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Fri, 29 Aug 2003 05:10:53 +0000 Subject: [PATCH] comment out some Song Options screen-related bits. (the option in the machine options screen shouldn't be there, for example) --- stepmania/src/ScreenMachineOptions.cpp | 32 +++++------ stepmania/src/ScreenPlayerOptions.cpp | 74 +++++++++++++------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp index 0728d9f3d5..4e5a70d562 100644 --- a/stepmania/src/ScreenMachineOptions.cpp +++ b/stepmania/src/ScreenMachineOptions.cpp @@ -38,7 +38,7 @@ enum { MO_SHOWSTATS, MO_COINS_PER_CREDIT, MO_JOINT_PREMIUM, - MO_SHOW_SONG_OPTIONS, +// MO_SHOW_SONG_OPTIONS, NUM_MACHINE_OPTIONS_LINES }; @@ -56,7 +56,7 @@ OptionRow g_MachineOptionsLines[NUM_MACHINE_OPTIONS_LINES] = { OptionRow( "Show\nStats", true, "OFF","ON" ), OptionRow( "Coins Per\nCredit", true, "1","2","3","4","5","6","7","8" ), OptionRow( "Joint\nPremium", true, "OFF","ON" ), - OptionRow( "Song\nOptions", true, "HIDE","SHOW","ASK" ), +// OptionRow( "Song\nOptions", true, "HIDE","SHOW","ASK" ), }; ScreenMachineOptions::ScreenMachineOptions() : @@ -118,13 +118,13 @@ void ScreenMachineOptions::ImportOptions() m_iSelectedOption[0][MO_SHOWSTATS] = PREFSMAN->m_bShowStats ? 1:0; m_iSelectedOption[0][MO_COINS_PER_CREDIT] = PREFSMAN->m_iCoinsPerCredit - 1; m_iSelectedOption[0][MO_JOINT_PREMIUM] = PREFSMAN->m_bJointPremium ? 1:0; - switch(PREFSMAN->m_ShowSongOptions) - { - case PrefsManager::YES: m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS] = 1; break; - case PrefsManager::NO: m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS] = 0; break; - case PrefsManager::ASK: m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS] = 2; break; - default: ASSERT(0); - } +// switch(PREFSMAN->m_ShowSongOptions) +// { +// case PrefsManager::YES: m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS] = 1; break; +// case PrefsManager::NO: m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS] = 0; break; +// case PrefsManager::ASK: m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS] = 2; break; +// default: ASSERT(0); +// } } void ScreenMachineOptions::ExportOptions() @@ -189,13 +189,13 @@ void ScreenMachineOptions::ExportOptions() PREFSMAN->m_iCoinsPerCredit = m_iSelectedOption[0][MO_COINS_PER_CREDIT] + 1; PREFSMAN->m_bJointPremium = m_iSelectedOption[0][MO_JOINT_PREMIUM] == 1; - switch(m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS]) - { - case 0: PREFSMAN->m_ShowSongOptions = PrefsManager::NO; break; - case 1: PREFSMAN->m_ShowSongOptions = PrefsManager::YES; break; - case 2: PREFSMAN->m_ShowSongOptions = PrefsManager::ASK; break; - default: ASSERT(0); - } +// switch(m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS]) +// { +// case 0: PREFSMAN->m_ShowSongOptions = PrefsManager::NO; break; +// case 1: PREFSMAN->m_ShowSongOptions = PrefsManager::YES; break; +// case 2: PREFSMAN->m_ShowSongOptions = PrefsManager::ASK; break; +// default: ASSERT(0); +// } } void ScreenMachineOptions::GoToPrevState() diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 99210147d8..5b40317478 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -98,20 +98,20 @@ ScreenPlayerOptions::ScreenPlayerOptions() : /* If we're going to "press start for more options" or skipping options * entirely, we need a different fade out. XXX: this is a hack */ - if(PREFSMAN->m_ShowSongOptions == PrefsManager::NO) +// if(PREFSMAN->m_ShowSongOptions == PrefsManager::NO) m_Menu.m_Out.Load( THEME->GetPathToB("ScreenPlayerOptions direct out") ); /* direct to stage */ - else if(PREFSMAN->m_ShowSongOptions == PrefsManager::ASK) - m_Menu.m_Out.Load( THEME->GetPathToB("ScreenPlayerOptions option out") ); /* optional song options */ +// else if(PREFSMAN->m_ShowSongOptions == PrefsManager::ASK) +// m_Menu.m_Out.Load( THEME->GetPathToB("ScreenPlayerOptions option out") ); /* optional song options */ - m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenPlayerOptions options") ); - m_sprOptionsMessage.StopAnimating(); - m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y ); - m_sprOptionsMessage.SetZoom( 1 ); - m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); +// m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenPlayerOptions options") ); +// m_sprOptionsMessage.StopAnimating(); +// m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y ); +// m_sprOptionsMessage.SetZoom( 1 ); +// m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); //this->AddChild( &m_sprOptionsMessage ); // we have to draw this manually over the top of transitions m_bAcceptedChoices = false; - m_bGoToOptions = ( PREFSMAN->m_ShowSongOptions == PrefsManager::YES ); +// m_bGoToOptions = ( PREFSMAN->m_ShowSongOptions == PrefsManager::YES ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); } @@ -462,10 +462,10 @@ void ScreenPlayerOptions::GoToNextState() { GAMESTATE->AdjustFailType(); - if( m_bGoToOptions ) +// if( m_bGoToOptions ) SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) ); - else - SCREENMAN->SetNewScreen( ScreenSongOptions::GetNextScreen() ); +// else +// SCREENMAN->SetNewScreen( ScreenSongOptions::GetNextScreen() ); } } @@ -473,19 +473,19 @@ void ScreenPlayerOptions::GoToNextState() void ScreenPlayerOptions::Update( float fDelta ) { ScreenOptions::Update( fDelta ); - m_sprOptionsMessage.Update( fDelta ); +// m_sprOptionsMessage.Update( fDelta ); } void ScreenPlayerOptions::DrawPrimitives() { ScreenOptions::DrawPrimitives(); - m_sprOptionsMessage.Draw(); +// m_sprOptionsMessage.Draw(); } void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) { - if( !GAMESTATE->m_bEditing && +/* if( !GAMESTATE->m_bEditing && type == IET_FIRST_PRESS && !m_Menu.m_In.IsTransitioning() && MenuI.IsValid() && @@ -499,33 +499,33 @@ void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventTyp SOUND->PlayOnce( THEME->GetPathToS("Common start") ); } } - +*/ ScreenOptions::Input( DeviceI, type, GameI, MenuI, StyleI ); } void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM ) { - if(PREFSMAN->m_ShowSongOptions == PrefsManager::ASK) - switch( SM ) - { - case SM_BeginFadingOut: // when the user accepts the page of options - { - m_bAcceptedChoices = true; - - float fShowSeconds = m_Menu.m_Out.GetLengthSeconds(); - - // show "hold START for options" - m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); - m_sprOptionsMessage.BeginTweening( 0.15f ); // fade in - m_sprOptionsMessage.SetZoomY( 1 ); - m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,1) ); - m_sprOptionsMessage.BeginTweening( fShowSeconds-0.3f ); // sleep - m_sprOptionsMessage.BeginTweening( 0.15f ); // fade out - m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); - m_sprOptionsMessage.SetZoomY( 0 ); - } - break; - } +// if(PREFSMAN->m_ShowSongOptions == PrefsManager::ASK) +// switch( SM ) +// { +// case SM_BeginFadingOut: // when the user accepts the page of options +// { +// m_bAcceptedChoices = true; +// +// float fShowSeconds = m_Menu.m_Out.GetLengthSeconds(); +// +// // show "hold START for options" +// m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); +// m_sprOptionsMessage.BeginTweening( 0.15f ); // fade in +// m_sprOptionsMessage.SetZoomY( 1 ); +// m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,1) ); +// m_sprOptionsMessage.BeginTweening( fShowSeconds-0.3f ); // sleep +// m_sprOptionsMessage.BeginTweening( 0.15f ); // fade out +// m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); +// m_sprOptionsMessage.SetZoomY( 0 ); +// } +// break; +// } ScreenOptions::HandleScreenMessage( SM ); }