phase out TweenOursOnScreen

stepmania/src/ScreenEz2SelectPlayer.cpp

@@ -84,8 +84,6 @@ void ScreenEz2SelectPlayer::Init()
 	SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select player intro") );
 
 	SOUND->PlayMusic( THEME->GetPathS("ScreenSelectPlayer","music") );
-
-	TweenOursOnScreen();
 }
 
 /************************************
@@ -211,7 +209,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
 	}
 }
 
-void ScreenEz2SelectPlayer::TweenOursOnScreen()
+void ScreenEz2SelectPlayer::TweenOnScreen()
 {
 	FOREACH_PlayerNumber( p )
 	{
@@ -229,6 +227,8 @@ void ScreenEz2SelectPlayer::TweenOursOnScreen()
 		m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
 		m_sprJoinFrame[p].SetX( fOriginalX );
 	}
+
+	ScreenWithMenuElements::TweenOnScreen();
 }
 
 void ScreenEz2SelectPlayer::TweenOffScreen()

stepmania/src/ScreenEz2SelectPlayer.h

@@ -24,7 +24,7 @@ public:
 	virtual void MenuBack( PlayerNumber pn );
 private:
 	void TweenOffScreen();
-	void TweenOursOnScreen();
+	void TweenOnScreen();
 	
 	Sprite	m_sprJoinMessage[NUM_PLAYERS];
 	Sprite	m_sprJoinFrame[NUM_PLAYERS];

stepmania/src/ScreenGameplay.cpp

@@ -868,8 +868,6 @@ void ScreenGameplay::Init()
 	 * positioned before we TweenOnScreen. */
 	LoadNextSong();
 
-	TweenOursOnScreen();
-
 	this->SortByDrawOrder();
 
 	m_GiveUpTimer.SetZero();
@@ -2616,7 +2614,7 @@ void ScreenGameplay::Cancel( ScreenMessage smSendWhenDone )
 	ScreenWithMenuElements::Cancel( smSendWhenDone );
 }
 
-void ScreenGameplay::TweenOursOnScreen()
+void ScreenGameplay::TweenOnScreen()
 {
 	ON_COMMAND( m_sprLifeFrame );
 	ON_COMMAND( m_sprCourseSongNumber );
@@ -2652,6 +2650,8 @@ void ScreenGameplay::TweenOursOnScreen()
 	if( m_bShowScoreboard )
 		FOREACH_NSScoreBoardColumn( sc )
 			ON_COMMAND( m_Scoreboard[sc] );
+
+	ScreenWithMenuElements::TweenOnScreen();
 }
 
 void ScreenGameplay::TweenOffScreen()

stepmania/src/ScreenGameplay.h

@@ -130,7 +130,7 @@ protected:
 	ThemeMetric<bool> USE_FORCED_MODIFIERS_IN_BEGINNER;
 	ThemeMetric<CString> FORCED_MODIFIERS_IN_BEGINNER;
 
-	void TweenOursOnScreen();
+	void TweenOnScreen();
 	void TweenOffScreen();
 
 	bool IsLastSong();

stepmania/src/ScreenSelectGroup.cpp

@@ -129,7 +129,6 @@ void ScreenSelectGroup::Init()
 	SOUND->PlayMusic( THEME->GetPathS("ScreenSelectGroup","music") );
 
 	AfterChange();
-	TweenOursOnScreen();
 	m_GroupList.SetSelection(0);
 
 	this->SortByDrawOrder();
@@ -248,7 +247,7 @@ void ScreenSelectGroup::TweenOffScreen()
 	m_GroupList.TweenOffScreen();
 }
 
-void ScreenSelectGroup::TweenOursOnScreen() 
+void ScreenSelectGroup::TweenOnScreen() 
 {
 	SET_XY_AND_ON_COMMAND( m_sprExplanation );
 	SET_XY_AND_ON_COMMAND( m_sprFrame );
@@ -259,6 +258,8 @@ void ScreenSelectGroup::TweenOursOnScreen()
 	SET_XY_AND_ON_COMMAND( m_GroupList );
 	m_MusicList.TweenOnScreen();
 	m_GroupList.TweenOnScreen();
+
+	ScreenWithMenuElements::TweenOnScreen();
 }
 
 /*

stepmania/src/ScreenSelectGroup.h

@@ -29,7 +29,7 @@ public:
 	void MenuStart( PlayerNumber pn );
 	void MenuBack( PlayerNumber pn );
 
-	void TweenOursOnScreen();
+	void TweenOnScreen();
 	void TweenOffScreen();
 
 private:

stepmania/src/ScreenSelectMaster.cpp

@@ -212,8 +212,6 @@ void ScreenSelectMaster::Init()
 
 void ScreenSelectMaster::BeginScreen()
 {
-	ScreenSelect::BeginScreen();
-
 	// TODO: Move default choice to ScreenSelect
 	int iDefaultChoice = -1;
 	for( unsigned c=0; c<m_aGameCommands.size(); c++ )
@@ -255,7 +253,7 @@ void ScreenSelectMaster::BeginScreen()
 
 	this->UpdateSelectableChoices();
 
-	TweenOursOnScreen();
+	ScreenSelect::BeginScreen();
 
 	m_fLockInputSecs = (bool)OVERRIDE_LOCK_INPUT_SECONDS ? LOCK_INPUT_SECONDS : this->GetTweenTimeLeft();
 	if( m_fLockInputSecs == 0 )
@@ -764,8 +762,10 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn )
  * This means that the focus command should be position neutral; eg. only use "addx",
  * not "x".
  */
-void ScreenSelectMaster::TweenOursOnScreen() 
+void ScreenSelectMaster::TweenOnScreen()
 {
+	ScreenSelect::TweenOnScreen();
+
 	vector<PlayerNumber> vpns;
 	if( SHARED_SELECTION )
 	{

stepmania/src/ScreenSelectMaster.h

@@ -22,7 +22,7 @@ public:
 	virtual void MenuUp( const InputEventPlus &input );
 	virtual void MenuDown( const InputEventPlus &input );
 	virtual void MenuStart( PlayerNumber pn );
-	void TweenOursOnScreen();
+	virtual void TweenOnScreen();
 	virtual void TweenOffScreen();
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );