From 39d15c0dcbb794544da4a576f0fb3496e40524a6 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 1 Sep 2005 02:59:48 +0000
Subject: [PATCH] cleanup: SetXY in Init, ON_COMMAND in BeginScreen call base
 last

---
 stepmania/src/ScreenSelectDifficulty.cpp |  4 +--
 stepmania/src/ScreenSelectStyle.cpp      | 31 ++++++++++++++++++------
 stepmania/src/ScreenSelectStyle.h        |  1 +
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index e25333d996..b8cff9c503 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -133,8 +133,6 @@ void ScreenSelectDifficulty::Init()
 
 void ScreenSelectDifficulty::BeginScreen()
 {
-	ScreenSelect::BeginScreen();
-
 	for( int page=0; page<NUM_PAGES; page++ )
 	{
 		ON_COMMAND( m_sprExplanation[page] );
@@ -152,6 +150,8 @@ void ScreenSelectDifficulty::BeginScreen()
 		ON_COMMAND( m_sprCursor[p] );
 		ON_COMMAND( m_sprShadow[p] );
 	}
+
+	ScreenSelect::BeginScreen();
 }
 
 void ScreenSelectDifficulty::Update( float fDelta )
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index b9bd7fd29a..c98133e387 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -101,8 +101,6 @@ void ScreenSelectStyle::Init()
 		this->MoveToTail( &m_sprInfo[i] );
 
 
-	this->UpdateSelectableChoices();
-
 	m_sprPremium.SetName( "Premium" );
 
 	switch( GAMESTATE->GetPremium() )
@@ -126,17 +124,36 @@ void ScreenSelectStyle::Init()
 	//
 	for( unsigned i=0; i<m_aGameCommands.size(); i++ )
 	{
-		SET_XY_AND_ON_COMMAND( m_textIcon[i] );
-		SET_XY_AND_ON_COMMAND( m_sprIcon[i] );
+		SET_XY( m_textIcon[i] );
+		SET_XY( m_sprIcon[i] );
 	}
-	SET_XY_AND_ON_COMMAND( m_sprExplanation );
-	SET_XY_AND_ON_COMMAND( m_sprWarning );
-	SET_XY_AND_ON_COMMAND( m_sprPremium );
+	SET_XY( m_sprExplanation );
+	SET_XY( m_sprWarning );
+	SET_XY( m_sprPremium );
 
 	// let AfterChange tween Picture and Info
 	this->SortByDrawOrder();
 }
 
+void ScreenSelectStyle::BeginScreen()
+{
+	this->UpdateSelectableChoices();
+
+	//
+	// TweenOnScreen
+	//
+	for( unsigned i=0; i<m_aGameCommands.size(); i++ )
+	{
+		ON_COMMAND( m_textIcon[i] );
+		ON_COMMAND( m_sprIcon[i] );
+	}
+	ON_COMMAND( m_sprExplanation );
+	ON_COMMAND( m_sprWarning );
+	ON_COMMAND( m_sprPremium );
+
+	ScreenSelect::BeginScreen();
+}
+
 void ScreenSelectStyle::MenuLeft( PlayerNumber pn )
 {
 	int iSwitchToIndex = -1;	// -1 means none found
diff --git a/stepmania/src/ScreenSelectStyle.h b/stepmania/src/ScreenSelectStyle.h
index 26536e00dd..cf65d22839 100644
--- a/stepmania/src/ScreenSelectStyle.h
+++ b/stepmania/src/ScreenSelectStyle.h
@@ -15,6 +15,7 @@ class ScreenSelectStyle : public ScreenSelect
 public:
 	ScreenSelectStyle( CString sName );
 	virtual void Init();
+	virtual void BeginScreen();
 
 	virtual void MenuLeft( PlayerNumber pn );
 	virtual void MenuRight( PlayerNumber pn );