From 50a31993a6eaf7e0ec7d96b5f3acf77e120835ec Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Jul 2005 22:26:09 +0000 Subject: [PATCH] TweenOursOnScreen/TweenOursOffScreen --- stepmania/src/ScreenEvaluation.cpp | 6 +++--- stepmania/src/ScreenEvaluation.h | 3 +-- stepmania/src/ScreenEz2SelectPlayer.cpp | 10 +++++----- stepmania/src/ScreenEz2SelectPlayer.h | 4 ++-- stepmania/src/ScreenGameplay.cpp | 10 +++++----- stepmania/src/ScreenGameplay.h | 4 ++-- stepmania/src/ScreenGameplayMultiplayer.cpp | 8 ++++---- stepmania/src/ScreenGameplayMultiplayer.h | 4 ++-- stepmania/src/ScreenSelectMusic.cpp | 8 ++++---- stepmania/src/ScreenSelectMusic.h | 4 ++-- 10 files changed, 30 insertions(+), 31 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 97406ecc03..7b8ffd0a4d 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -1084,7 +1084,7 @@ void ScreenEvaluation::CommitScores( } -void ScreenEvaluation::TweenOffScreen() +void ScreenEvaluation::TweenOursOffScreen() { // large banner area OFF_COMMAND( m_LargeBanner ); @@ -1379,7 +1379,7 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn ) void ScreenEvaluation::EndScreen() { - TweenOffScreen(); + TweenOursOffScreen(); FOREACH_PlayerNumber( p ) m_Grades[p].SettleImmediately(); @@ -1394,7 +1394,7 @@ void ScreenEvaluation::EndScreen() /* Tween the screen out, but leave the MenuElements where they are. * Play the "swoosh" sound manually (would normally be played by the ME * tween out). */ - TweenOffScreen(); + TweenOursOffScreen(); } break; } diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index deb5befc61..138da6637e 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -38,8 +38,7 @@ public: virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM ); -// virtual void TweenOnScreen(); - virtual void TweenOffScreen(); + virtual void TweenOursOffScreen(); virtual void MenuLeft( PlayerNumber pn ); virtual void MenuRight( PlayerNumber pn ); virtual void MenuBack( PlayerNumber pn ); diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 7bbcb6ddce..a6f19ea4bf 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -85,7 +85,7 @@ void ScreenEz2SelectPlayer::Init() SOUND->PlayMusic( THEME->GetPathS("ScreenSelectPlayer","music") ); - TweenOnScreen(); + TweenOursOnScreen(); } /************************************ @@ -138,7 +138,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM ) MenuStart(PLAYER_1); } - TweenOffScreen(); + TweenOursOffScreen(); StartTransitioning( SM_GoToNextScreen ); break; } @@ -201,7 +201,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn ) if( bBothSidesJoined ) { - TweenOffScreen(); + TweenOursOffScreen(); StartTransitioning( SM_GoToNextScreen ); } else @@ -213,7 +213,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn ) } } -void ScreenEz2SelectPlayer::TweenOnScreen() +void ScreenEz2SelectPlayer::TweenOursOnScreen() { FOREACH_PlayerNumber( p ) { @@ -233,7 +233,7 @@ void ScreenEz2SelectPlayer::TweenOnScreen() } } -void ScreenEz2SelectPlayer::TweenOffScreen() +void ScreenEz2SelectPlayer::TweenOursOffScreen() { FOREACH_PlayerNumber( p ) { diff --git a/stepmania/src/ScreenEz2SelectPlayer.h b/stepmania/src/ScreenEz2SelectPlayer.h index bac7783285..4ed6970ca2 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.h +++ b/stepmania/src/ScreenEz2SelectPlayer.h @@ -23,8 +23,8 @@ public: virtual void MenuStart( PlayerNumber pn ); virtual void MenuBack( PlayerNumber pn ); private: - void TweenOffScreen(); - void TweenOnScreen(); + void TweenOursOffScreen(); + void TweenOursOnScreen(); Sprite m_sprJoinMessage[NUM_PLAYERS]; Sprite m_sprJoinFrame[NUM_PLAYERS]; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index b24b7ff277..367caff429 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -657,7 +657,7 @@ void ScreenGameplay::Init() * positioned before we TweenOnScreen. */ LoadNextSong(); - TweenOnScreen(); + TweenOursOnScreen(); this->SortByDrawOrder(); @@ -2137,7 +2137,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) return; } - TweenOffScreen(); + TweenOursOffScreen(); // do they deserve an extra stage? if( GAMESTATE->HasEarnedExtraStage() ) @@ -2287,7 +2287,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) AbortGiveUp( false ); m_pSoundMusic->StopPlaying(); m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */ - TweenOffScreen(); + TweenOursOffScreen(); m_Failed.StartTransitioning( SM_GoToNextScreen ); // show the survive time if extra stage @@ -2326,7 +2326,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) } -void ScreenGameplay::TweenOnScreen() +void ScreenGameplay::TweenOursOnScreen() { ON_COMMAND( m_sprLifeFrame ); ON_COMMAND( m_sprCourseSongNumber ); @@ -2362,7 +2362,7 @@ void ScreenGameplay::TweenOnScreen() ON_COMMAND( m_Scoreboard[sc] ); } -void ScreenGameplay::TweenOffScreen() +void ScreenGameplay::TweenOursOffScreen() { ScreenWithMenuElements::TweenOffScreen(); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index c207ed9f89..4cae9c7bc1 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -63,8 +63,8 @@ protected: ThemeMetric USE_FORCED_MODIFIERS_IN_BEGINNER; ThemeMetric FORCED_MODIFIERS_IN_BEGINNER; - void TweenOnScreen(); - void TweenOffScreen(); + void TweenOursOnScreen(); + void TweenOursOffScreen(); bool IsLastSong(); void SetupSong( int iSongIndex ); diff --git a/stepmania/src/ScreenGameplayMultiplayer.cpp b/stepmania/src/ScreenGameplayMultiplayer.cpp index e314a6581e..bf01fa3b04 100644 --- a/stepmania/src/ScreenGameplayMultiplayer.cpp +++ b/stepmania/src/ScreenGameplayMultiplayer.cpp @@ -235,10 +235,10 @@ void ScreenGameplayMultiplayer::Init() /* LoadNextSong first, since that positions some elements which need to be - * positioned before we TweenOnScreen. */ + * positioned before we TweenOursOnScreen. */ LoadNextSong(); - TweenOnScreen(); + TweenOursOnScreen(); this->SortByDrawOrder(); @@ -617,7 +617,7 @@ void ScreenGameplayMultiplayer::HandleScreenMessage( const ScreenMessage SM ) } -void ScreenGameplayMultiplayer::TweenOnScreen() +void ScreenGameplayMultiplayer::TweenOursOnScreen() { FOREACH_MultiPlayer(p) { @@ -628,7 +628,7 @@ void ScreenGameplayMultiplayer::TweenOnScreen() m_In.StartTransitioning( SM_Ready ); } -void ScreenGameplayMultiplayer::TweenOffScreen() +void ScreenGameplayMultiplayer::TweenOursOffScreen() { FOREACH_MultiPlayer(p) { diff --git a/stepmania/src/ScreenGameplayMultiplayer.h b/stepmania/src/ScreenGameplayMultiplayer.h index 6f4b709b87..34b0c038fa 100644 --- a/stepmania/src/ScreenGameplayMultiplayer.h +++ b/stepmania/src/ScreenGameplayMultiplayer.h @@ -53,8 +53,8 @@ public: virtual bool UsesBackground() const { return false; } protected: - void TweenOnScreen(); - void TweenOffScreen(); + void TweenOursOnScreen(); + void TweenOursOffScreen(); bool IsLastSong(); void SetupSong( MultiPlayer p, int iSongIndex ); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 2ee7fbf3a3..47cedbc489 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -318,7 +318,7 @@ void ScreenSelectMusic::Init() ZERO( m_iSelection ); AfterMusicChange(); - TweenOnScreen(); + TweenOursOnScreen(); this->SortByDrawOrder(); } @@ -431,7 +431,7 @@ void ScreenSelectMusic::SkipCoursePartTweens() m_CourseContents.FinishTweening(); } -void ScreenSelectMusic::TweenOnScreen() +void ScreenSelectMusic::TweenOursOnScreen() { TweenSongPartsOnScreen( true ); TweenCoursePartsOnScreen( true ); @@ -481,7 +481,7 @@ void ScreenSelectMusic::TweenOnScreen() } } -void ScreenSelectMusic::TweenOffScreen() +void ScreenSelectMusic::TweenOursOffScreen() { ScreenWithMenuElements::TweenOffScreen(); @@ -1215,7 +1215,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) if( m_bMadeChoice ) { - TweenOffScreen(); + TweenOursOffScreen(); SCREENMAN->PlayStartSound(); if( OPTIONS_MENU_AVAILABLE ) diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index e77e636bff..035400a2ae 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -46,8 +46,8 @@ public: virtual void PushSelf( lua_State *L ); protected: - void TweenOnScreen(); - void TweenOffScreen(); + void TweenOursOnScreen(); + void TweenOursOffScreen(); void TweenScoreOnAndOffAfterChangeSort(); enum DisplayMode { DISPLAY_SONGS, DISPLAY_COURSES, DISPLAY_MODES } m_DisplayMode; void SwitchDisplayMode( DisplayMode dm );