From bd817f3d93a4d979dd79af3fa8c735edccec24d1 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 13 Oct 2005 22:49:20 +0000
Subject: [PATCH] simplify

---
 stepmania/src/ScreenEz2SelectPlayer.cpp | 6 +++---
 stepmania/src/ScreenEz2SelectPlayer.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index ecd1de0b67..6754bc8187 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -138,7 +138,6 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
 			MenuStart(PLAYER_1);
 		}
 
-		TweenOursOffScreen();
 		StartTransitioningScreen( SM_GoToNextScreen );
 		break;
 	}
@@ -201,7 +200,6 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
 
 	if( bBothSidesJoined )
 	{
-		TweenOursOffScreen();
 		StartTransitioningScreen( SM_GoToNextScreen );
 	}
 	else
@@ -233,8 +231,10 @@ void ScreenEz2SelectPlayer::TweenOursOnScreen()
 	}
 }
 
-void ScreenEz2SelectPlayer::TweenOursOffScreen()
+void ScreenEz2SelectPlayer::TweenOffScreen()
 {
+	ScreenWithMenuElements::TweenOffScreen();
+
 	FOREACH_PlayerNumber( p )
 	{
 		float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH );
diff --git a/stepmania/src/ScreenEz2SelectPlayer.h b/stepmania/src/ScreenEz2SelectPlayer.h
index 23f5972e1f..344cda0d1c 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.h
+++ b/stepmania/src/ScreenEz2SelectPlayer.h
@@ -23,7 +23,7 @@ public:
 	virtual void MenuStart( PlayerNumber pn );
 	virtual void MenuBack( PlayerNumber pn );
 private:
-	void TweenOursOffScreen();
+	void TweenOffScreen();
 	void TweenOursOnScreen();
 	
 	Sprite	m_sprJoinMessage[NUM_PLAYERS];