diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index 721d094537..aae919ebbc 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -154,7 +154,6 @@ void ScreenSelectCharacter::Init() for( unsigned i=0; iSortByDrawOrder(); } @@ -357,7 +356,7 @@ void ScreenSelectCharacter::MenuStart( PlayerNumber pn ) } StopTimer(); - TweenOffScreen(); + TweenOursOffScreen(); this->PostScreenMessage( SM_BeginFadingOut, SLEEP_AFTER_TWEEN_OFF_SECONDS ); } } @@ -367,7 +366,7 @@ void ScreenSelectCharacter::MenuBack( PlayerNumber pn ) Cancel( SM_GoToPrevScreen ); } -void ScreenSelectCharacter::TweenOffScreen() +void ScreenSelectCharacter::TweenOursOffScreen() { FOREACH_PlayerNumber( p ) { @@ -387,10 +386,6 @@ void ScreenSelectCharacter::TweenOffScreen() m_sprExplanation.RunCommands( EXPLANATION_OFF_COMMAND ); } -void ScreenSelectCharacter::TweenOnScreen() -{ -} - /* * (c) 2003-2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h index 6ecc9ea25b..8e0ab9280f 100644 --- a/stepmania/src/ScreenSelectCharacter.h +++ b/stepmania/src/ScreenSelectCharacter.h @@ -30,8 +30,7 @@ public: void MenuStart( PlayerNumber pn ); void MenuBack( PlayerNumber pn ); - void TweenOffScreen(); - void TweenOnScreen(); + void TweenOursOffScreen(); private: // These functions take the PlayerNumber of the player making the selections, diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 54edc88fab..0c23c576cf 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -116,7 +116,7 @@ void ScreenSelectDifficulty::Init() this->UpdateSelectableChoices(); - TweenOnScreen(); + TweenOursOnScreen(); this->SortByDrawOrder(); } @@ -134,7 +134,7 @@ void ScreenSelectDifficulty::HandleScreenMessage( const ScreenMessage SM ) switch( SM ) { case SM_BeginFadingOut: - TweenOffScreen(); + TweenOursOffScreen(); SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, SLEEP_AFTER_TWEEN_OFF_SECONDS ); // nofify parent that we're finished StopTimer(); break; @@ -490,7 +490,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) this->PostScreenMessage( SM_BeginFadingOut, SLEEP_AFTER_CHOICE_SECONDS ); // tell our owner it's time to move on } -void ScreenSelectDifficulty::TweenOnScreen() +void ScreenSelectDifficulty::TweenOursOnScreen() { for( int page=0; pagePlayMusic( THEME->GetPathS("ScreenSelectGroup","music") ); AfterChange(); - TweenOnScreen(); + TweenOursOnScreen(); m_GroupList.SetSelection(0); this->SortByDrawOrder(); @@ -227,7 +227,7 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn ) SOUND->PlayOnceFromAnnouncer( "select group comment general" ); - TweenOffScreen(); + TweenOursOffScreen(); this->PostScreenMessage( SM_BeginFadingOut, SLEEP_AFTER_TWEEN_OFF_SECONDS ); } @@ -236,7 +236,7 @@ void ScreenSelectGroup::MenuBack( PlayerNumber pn ) Cancel( SM_GoToPrevScreen ); } -void ScreenSelectGroup::TweenOffScreen() +void ScreenSelectGroup::TweenOursOffScreen() { OFF_COMMAND( m_sprExplanation ); OFF_COMMAND( m_sprFrame ); @@ -249,7 +249,7 @@ void ScreenSelectGroup::TweenOffScreen() m_GroupList.TweenOffScreen(); } -void ScreenSelectGroup::TweenOnScreen() +void ScreenSelectGroup::TweenOursOnScreen() { SET_XY_AND_ON_COMMAND( m_sprExplanation ); SET_XY_AND_ON_COMMAND( m_sprFrame ); diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h index d5ada29984..e268efd6e5 100644 --- a/stepmania/src/ScreenSelectGroup.h +++ b/stepmania/src/ScreenSelectGroup.h @@ -29,8 +29,8 @@ public: void MenuStart( PlayerNumber pn ); void MenuBack( PlayerNumber pn ); - void TweenOffScreen(); - void TweenOnScreen(); + void TweenOursOnScreen(); + void TweenOursOffScreen(); private: diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index a3f7442846..6a1da4a16c 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -229,7 +229,7 @@ void ScreenSelectMaster::Init() this->UpdateSelectableChoices(); - TweenOnScreen(); + TweenOursOnScreen(); m_fLockInputSecs = (bool)OVERRIDE_LOCK_INPUT_SECONDS ? LOCK_INPUT_SECONDS : this->GetTweenTimeLeft(); if( m_fLockInputSecs == 0 ) @@ -284,9 +284,9 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM ) } else if( SM == SM_BeginFadingOut ) { - TweenOffScreen(); + TweenOursOffScreen(); /* - * We start our own tween-out (TweenOffScreen), wait some amount of time, then + * We start our own tween-out (TweenOursOffScreen), wait some amount of time, then * start the base tween (ScreenWithMenuElements, called from SM_AllDoneChoosing); * we move on when that finishes. This is a pain to tweak, especially now * that elements essentially owned by the derived class are starting to tween @@ -295,7 +295,7 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM ) * before moving on. * * Send a command to all children, so we can run overlay and underlay tweens at the - * same time as the elements controlled by TweenOffScreen. Run this here, so + * same time as the elements controlled by TweenOursOffScreen. Run this here, so * it affects the result of GetTweenTimeLeft(). */ this->PlayCommand( "TweenOff" ); @@ -737,7 +737,7 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn ) * This means that the focus command should be position neutral; eg. only use "addx", * not "x". */ -void ScreenSelectMaster::TweenOnScreen() +void ScreenSelectMaster::TweenOursOnScreen() { vector vpns; if( SHARED_SELECTION ) @@ -803,7 +803,7 @@ void ScreenSelectMaster::TweenOnScreen() this->SortByDrawOrder(); } -void ScreenSelectMaster::TweenOffScreen() +void ScreenSelectMaster::TweenOursOffScreen() { vector vpns; if( SHARED_SELECTION ) diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h index e2afd3100d..4b7620bb3a 100644 --- a/stepmania/src/ScreenSelectMaster.h +++ b/stepmania/src/ScreenSelectMaster.h @@ -22,8 +22,8 @@ public: virtual void MenuUp( PlayerNumber pn, const InputEventType type ); virtual void MenuDown( PlayerNumber pn, const InputEventType type ); virtual void MenuStart( PlayerNumber pn ); - void TweenOffScreen(); - void TweenOnScreen(); + void TweenOursOnScreen(); + void TweenOursOffScreen(); virtual void HandleScreenMessage( const ScreenMessage SM );