From 767894800b20f24a6451fc01171c389a2282c4f6 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 12 Mar 2003 03:44:55 +0000 Subject: [PATCH] fix transitions in ScreenGameplay --- stepmania/src/CourseEntryDisplay.cpp | 4 ++-- stepmania/src/ScreenGameplay.cpp | 3 --- stepmania/src/ScreenGameplay.h | 2 -- stepmania/src/ScreenOptions.cpp | 3 +++ stepmania/src/ScreenPlayerOptions.cpp | 4 ++-- stepmania/src/ScreenSelectGroup.cpp | 3 +++ 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp index 7a6b6db695..a86e088d14 100644 --- a/stepmania/src/CourseEntryDisplay.cpp +++ b/stepmania/src/CourseEntryDisplay.cpp @@ -46,7 +46,7 @@ CourseEntryDisplay::CourseEntryDisplay() { - m_sprFrame.Load( THEME->GetPathTo("Graphics","select course content bar") ); + m_sprFrame.Load( THEME->GetPathTo("Graphics","CourseEntryDisplay bar") ); this->AddChild( &m_sprFrame ); m_textNumber.LoadFromFont( THEME->GetPathTo("Fonts","Header2") ); @@ -57,7 +57,7 @@ CourseEntryDisplay::CourseEntryDisplay() m_TextBanner.SetXY( TEXT_BANNER_X, TEXT_BANNER_Y ); this->AddChild( &m_TextBanner ); - m_textFoot.LoadFromTextureAndChars( THEME->GetPathTo("Graphics","select music meter 2x1"),"10" ); + m_textFoot.LoadFromTextureAndChars( THEME->GetPathTo("Graphics","CourseEntryDisplay difficulty 2x1"),"10" ); m_textFoot.SetXY( FOOT_X, FOOT_Y ); m_textFoot.EnableShadow( false ); this->AddChild( &m_textFoot ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 98af19113e..6ff51e9de6 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -470,8 +470,6 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration ) if( !bDemonstration ) // only load if we're going to use it { - m_soundFail.Load( THEME->GetPathTo("Sounds","ScreenGameplay failed") ); - m_soundTryExtraStage.Load( THEME->GetPathTo("Sounds","ScreenGameplay extra") ); m_soundOniDie.Load( THEME->GetPathTo("Sounds","ScreenGameplay oni die") ); m_announcerReady.Load( ANNOUNCER->GetPathTo("gameplay ready") ); if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) @@ -1480,7 +1478,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) // this->SendScreenMessage( SM_GoToScreenAfterFail, 0.2f ); // SCREENMAN->SendMessageToTopScreen( SM_PlayFailComment, 1.0f ); m_Failed.StartTransitioning( SM_GoToScreenAfterFail ); - m_soundFail.PlayRandom(); // make the background invisible so we don't waste power drawing it m_Background.BeginTweening( 1 ); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 375006f32f..3cb7d11573 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -142,9 +142,7 @@ protected: Sprite m_sprOniGameOver[NUM_PLAYERS]; void ShowOniGameOver( PlayerNumber pn ); - RandomSample m_soundFail; RandomSample m_soundOniDie; - RandomSample m_soundTryExtraStage; RandomSample m_announcerReady; RandomSample m_announcerHereWeGo; RandomSample m_announcerDanger; diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 0f389c78d1..ba7b012f7f 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -451,6 +451,9 @@ void ScreenOptions::StartGoToNextState() void ScreenOptions::MenuStart( PlayerNumber pn ) { + if( m_Menu.IsTransitioning() ) + return; + if( PREFSMAN->m_bArcadeOptionsNavigation ) { bool bAllOnExit = true; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index e185b9f225..46677da021 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -219,10 +219,10 @@ void ScreenPlayerOptions::DrawPrimitives() void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) { - if( type == IET_FIRST_PRESS && - !m_Menu.m_In.IsTransitioning() && + if( !m_Menu.m_In.IsTransitioning() && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && + type != IET_RELEASE && PREFSMAN->m_bShowSongOptions ) { if( m_bAcceptedChoices && !m_bGoToOptions ) diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 1757580aaa..3c522289e4 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -254,6 +254,9 @@ void ScreenSelectGroup::MenuDown( PlayerNumber pn ) void ScreenSelectGroup::MenuStart( PlayerNumber pn ) { + if( m_bChosen ) + return; + m_soundSelect.PlayRandom(); m_Menu.m_MenuTimer.Stop(); m_bChosen = true;