A lot of screens have TweenOffScreen functions; SWME has that, and it's not

virtual, so the names are clashing and confusing.  This should probably just
be virtual.  As an incremental step to that, rename all derived TweenOnScreen
and TweenOffScreen screen functions to TweenOursOnScreen and
TweenOursOffScreen.

stepmania/src/ScreenSelectCharacter.cpp

@@ -154,7 +154,6 @@ void ScreenSelectCharacter::Init()
 		for( unsigned i=0; i<MAX_CHAR_ICONS_TO_SHOW; i++ )
 			m_sprIcons[p][i].RunCommands( ICONS_ON_COMMAND(p) );
 	}
-	TweenOnScreen();
 
 	this->SortByDrawOrder();
 }
@@ -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.

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,

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; page<NUM_PAGES; page++ )
 	{
@@ -517,7 +517,7 @@ void ScreenSelectDifficulty::TweenOnScreen()
 	}
 }
 
-void ScreenSelectDifficulty::TweenOffScreen()
+void ScreenSelectDifficulty::TweenOursOffScreen()
 {	
 	const int page = m_CurrentPage;
 

stepmania/src/ScreenSelectDifficulty.h

@@ -25,8 +25,8 @@ public:
 	virtual void MenuDown( PlayerNumber pn ) {};
 	virtual void MenuStart( PlayerNumber pn );
 //	virtual void MenuBack( PlayerNumber pn );
-	virtual void TweenOffScreen();
-	virtual void TweenOnScreen();
+	virtual void TweenOursOnScreen();
+	virtual void TweenOursOffScreen();
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 

stepmania/src/ScreenSelectGroup.cpp

@@ -130,7 +130,7 @@ void ScreenSelectGroup::Init()
 	SOUND->PlayMusic( 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 );

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:
 

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<PlayerNumber> vpns;
 	if( SHARED_SELECTION )
@@ -803,7 +803,7 @@ void ScreenSelectMaster::TweenOnScreen()
 	this->SortByDrawOrder();
 }
 
-void ScreenSelectMaster::TweenOffScreen()
+void ScreenSelectMaster::TweenOursOffScreen()
 {
 	vector<PlayerNumber> vpns;
 	if( SHARED_SELECTION )

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 );