From ce86b65827749ab3556d776520901c904b8d98ee Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 21 Nov 2006 20:03:28 +0000 Subject: [PATCH] fix base call --- stepmania/src/ScreenEz2SelectMusic.cpp | 6 +++--- stepmania/src/ScreenEz2SelectPlayer.cpp | 6 +++--- stepmania/src/ScreenSelectCharacter.cpp | 4 ++-- stepmania/src/ScreenSelectGroup.cpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 99bca3eefd..33e1aa5214 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -309,7 +309,7 @@ void ScreenEz2SelectMusic::Input( const InputEventPlus &input ) m_soundButtonPress.Play(); } LastInputTime = RageTimer::GetTimeSinceStartFast(); - Screen::Input( input ); + ScreenWithMenuElements::Input( input ); } void ScreenEz2SelectMusic::UpdateOptions(PlayerNumber pn, int nosound) @@ -370,7 +370,7 @@ void ScreenEz2SelectMusic::UpdateOptions(PlayerNumber pn, int nosound) void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM ) { - Screen::HandleScreenMessage( SM ); + ScreenWithMenuElements::HandleScreenMessage( SM ); if( SM == SM_GoToNextScreen ) { @@ -507,7 +507,7 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime ) StartTransitioningScreen( SM_GoToNextScreen ); } - Screen::Update( fDeltaTime ); + ScreenWithMenuElements::Update( fDeltaTime ); } void ScreenEz2SelectMusic::EasierDifficulty( PlayerNumber pn ) diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index c0c6faf84a..0533026a6d 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -87,7 +87,7 @@ Desc: Animates the 1p/2p selection ************************************/ void ScreenEz2SelectPlayer::Update( float fDeltaTime ) { - Screen::Update( fDeltaTime ); + ScreenWithMenuElements::Update( fDeltaTime ); } /************************************ @@ -101,7 +101,7 @@ void ScreenEz2SelectPlayer::Input( const InputEventPlus &input ) if( IsTransitioning() ) return; - Screen::Input( input ); // default input handler + ScreenWithMenuElements::Input( input ); // default input handler } /************************************ @@ -111,7 +111,7 @@ Desc: Handles Screen Messages and changes ************************************/ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM ) { - Screen::HandleScreenMessage( SM ); + ScreenWithMenuElements::HandleScreenMessage( SM ); if( SM == SM_MenuTimer ) { diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index 7c0d6a5931..aef581957d 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -164,7 +164,7 @@ void ScreenSelectCharacter::Input( const InputEventPlus &input ) if( IsTransitioning() ) return; - Screen::Input( input ); // default input handler + ScreenWithMenuElements::Input( input ); // default input handler } void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM ) @@ -181,7 +181,7 @@ void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM ) } else { - Screen::HandleScreenMessage( SM ); + ScreenWithMenuElements::HandleScreenMessage( SM ); } } diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 83e6d77367..b53d96110c 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -132,7 +132,7 @@ void ScreenSelectGroup::Input( const InputEventPlus &input ) if( IsTransitioning() ) return; - Screen::Input( input ); // default input handler + ScreenWithMenuElements::Input( input ); // default input handler } void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM ) @@ -142,7 +142,7 @@ void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM ) StartTransitioningScreen( SM_GoToNextScreen ); return; } - Screen::HandleScreenMessage( SM ); + ScreenWithMenuElements::HandleScreenMessage( SM ); } void ScreenSelectGroup::AfterChange()