From 70e7740f71b88303dc644740f5d1b9f8a3201687 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 16 Aug 2006 20:10:37 +0000
Subject: [PATCH] split ScreenSelectMusic::TweenOnScreen

---
 stepmania/src/ScreenSelectMusic.cpp | 83 +++++++++++++++--------------
 stepmania/src/ScreenSelectMusic.h   |  1 +
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 6cd47a4088..23bc7affab 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -265,45 +265,6 @@ void ScreenSelectMusic::BeginScreen()
 
 	AfterMusicChange();
 
-	FOREACH_HumanPlayer( p )
-	{
-		ON_COMMAND( m_DifficultyMeter[p] );
-	}
-
-	TweenSongPartsOnScreen( true );
-
-	switch( GAMESTATE->m_SortOrder )
-	{
-	case SORT_ALL_COURSES:
-	case SORT_NONSTOP_COURSES:
-	case SORT_ONI_COURSES:
-	case SORT_ENDLESS_COURSES:
-		TweenSongPartsOffScreen( false );
-		SkipSongPartTweens();
-		break;
-	default:
-		break;
-	}
-
-	ON_COMMAND( m_Banner );
-	ON_COMMAND( m_DifficultyDisplay );
-	ON_COMMAND( m_sprCDTitleFront );
-	ON_COMMAND( m_sprCDTitleBack );
-	ON_COMMAND( m_GrooveRadar );
-	ON_COMMAND( m_textNumSongs );
-	ON_COMMAND( m_textTotalTime );
-	ON_COMMAND( m_MusicWheel );
-	ON_COMMAND( m_sprLongBalloon );
-	ON_COMMAND( m_sprMarathonBalloon );
-	ON_COMMAND( m_MusicWheel );
-	ON_COMMAND( m_MachineRank );
-
-	FOREACH_HumanPlayer( p )
-	{		
-		ON_COMMAND( m_sprHighScoreFrame[p] );
-		ON_COMMAND( m_textHighScore[p] );
-	}
-
 	SOUND->PlayOnceFromAnnouncer( "select music intro" );
 }
 
@@ -358,6 +319,50 @@ void ScreenSelectMusic::SkipSongPartTweens()
 	}
 }
 
+void ScreenSelectMusic::TweenOnScreen()
+{
+	ScreenWithMenuElements::TweenOnScreen();
+
+	FOREACH_HumanPlayer( p )
+	{
+		ON_COMMAND( m_DifficultyMeter[p] );
+	}
+
+	TweenSongPartsOnScreen( true );
+
+	switch( GAMESTATE->m_SortOrder )
+	{
+	case SORT_ALL_COURSES:
+	case SORT_NONSTOP_COURSES:
+	case SORT_ONI_COURSES:
+	case SORT_ENDLESS_COURSES:
+		TweenSongPartsOffScreen( false );
+		SkipSongPartTweens();
+		break;
+	default:
+		break;
+	}
+
+	ON_COMMAND( m_Banner );
+	ON_COMMAND( m_DifficultyDisplay );
+	ON_COMMAND( m_sprCDTitleFront );
+	ON_COMMAND( m_sprCDTitleBack );
+	ON_COMMAND( m_GrooveRadar );
+	ON_COMMAND( m_textNumSongs );
+	ON_COMMAND( m_textTotalTime );
+	ON_COMMAND( m_MusicWheel );
+	ON_COMMAND( m_sprLongBalloon );
+	ON_COMMAND( m_sprMarathonBalloon );
+	ON_COMMAND( m_MusicWheel );
+	ON_COMMAND( m_MachineRank );
+
+	FOREACH_HumanPlayer( p )
+	{		
+		ON_COMMAND( m_sprHighScoreFrame[p] );
+		ON_COMMAND( m_textHighScore[p] );
+	}
+}
+
 void ScreenSelectMusic::TweenOffScreen()
 {
 	ScreenWithMenuElements::TweenOffScreen();
diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h
index 0ac2e5c778..905326172a 100644
--- a/stepmania/src/ScreenSelectMusic.h
+++ b/stepmania/src/ScreenSelectMusic.h
@@ -46,6 +46,7 @@ public:
 	virtual void PushSelf( lua_State *L );
 
 protected:
+	void TweenOnScreen();
 	void TweenOffScreen();
 	void TweenScoreOnAndOffAfterChangeSort();
 	enum DisplayMode { DISPLAY_SONGS, DISPLAY_COURSES, DISPLAY_MODES } m_DisplayMode;