From ab117db9c05f919674bf47c78f8fe323f0a4c8c0 Mon Sep 17 00:00:00 2001
From: Andrew Livy <frieza@users.sourceforge.net>
Date: Wed, 25 Sep 2002 16:32:58 +0000
Subject: [PATCH] Pump/Para/Ez2 theme changes

---
 stepmania/Themes/default/metrics.ini   | 33 ++++++--------------------
 stepmania/src/ScreenEz2SelectStyle.cpp | 20 ++++++++++++----
 stepmania/src/ScreenEz2SelectStyle.h   |  2 ++
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 20db914b82..93f1f61bff 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -516,7 +516,7 @@ ColorSelectedDefault=0.2,1.0,0.2,1	// green
 ColorNotSelectedDefault=0.1,0.5,0.1,1	// grayed green
 HelpText=# $ to change line   ! " to select between options      then press START
 
-[ScreenMapInstruments]
+[ScreenMapControllers]
 HelpText=Use arrow keys to navigate, ENTER to assign, SPACE to clear, ESCAPE when done.
 
 [GhostArrow]
@@ -805,53 +805,34 @@ NumElements=0
 
 
 [bganims-pump-0]
-NumElements=2
+NumElements=1
 Sprite0-path=back
 Sprite0-effect=NULL
 Sprite0-zoom=1.0
 Sprite0-X=CENTER_X
 Sprite0-Y=CENTER_Y
-Sprite1-path=pleaseselectyourmode
-Sprite1-effect=NULL
-Sprite1-zoom=1.0
-Sprite1-X=CENTER_X
-Sprite1-Y=300
 
 [bganims-pump-1]
-NumElements=2
+NumElements=1
 Sprite0-path=back
 Sprite0-effect=NULL
 Sprite0-zoom=1.0
 Sprite0-X=CENTER_X
 Sprite0-Y=CENTER_Y
-Sprite1-path=pleaseselectyourmode
-Sprite1-effect=NULL
-Sprite1-zoom=1.0
-Sprite1-X=CENTER_X
-Sprite1-Y=300
 
 [bganims-pump-2]
-NumElements=2
+NumElements=1
 Sprite0-path=back
 Sprite0-effect=NULL
 Sprite0-zoom=1.0
 Sprite0-X=CENTER_X
 Sprite0-Y=CENTER_Y
-Sprite1-path=pleaseselectyourmode
-Sprite1-effect=NULL
-Sprite1-zoom=1.0
-Sprite1-X=CENTER_X
-Sprite1-Y=300
+
 
 [bganims-pump-3]
-NumElements=2
+NumElements=1
 Sprite0-path=back
 Sprite0-effect=NULL
 Sprite0-zoom=1.0
 Sprite0-X=CENTER_X
-Sprite0-Y=CENTER_Y
-Sprite1-path=pleaseselectyourmode
-Sprite1-effect=NULL
-Sprite1-zoom=1.0
-Sprite1-X=CENTER_X
-Sprite1-Y=300
\ No newline at end of file
+Sprite0-Y=CENTER_Y
\ No newline at end of file
diff --git a/stepmania/src/ScreenEz2SelectStyle.cpp b/stepmania/src/ScreenEz2SelectStyle.cpp
index 3a6add648a..e890823964 100644
--- a/stepmania/src/ScreenEz2SelectStyle.cpp
+++ b/stepmania/src/ScreenEz2SelectStyle.cpp
@@ -54,6 +54,9 @@ ScreenEz2SelectStyle::ScreenEz2SelectStyle()
 
 	
 	GAMESTATE->m_PlayMode = PLAY_MODE_ARCADE;	// the only mode you can select on this screen
+
+	m_Background.LoadFromAniDir( THEME->GetPathTo("BGAnimations","ez2 select style") );
+	this->AddChild( &m_Background ); // animated background =)
 	
 	/*********** TODO: MAKE THIS WORK FOR ALL GAME STYLES! *************/
 	for (int i=0; i<=3; i++)
@@ -64,6 +67,7 @@ ScreenEz2SelectStyle::ScreenEz2SelectStyle()
 	}
 	m_BGAnim[0].SetZoom(1.0f);
 
+
 	m_ScrollingList.SetXY( CENTER_X, SCROLLING_LIST_Y );
 	m_ScrollingList.SetSpacing( SCROLLING_ELEMENT_SPACING );
 	m_ScrollingList.SetNumberVisible( 9 );
@@ -72,12 +76,15 @@ ScreenEz2SelectStyle::ScreenEz2SelectStyle()
 
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{
+		// add the controllers, change their graphic if the player is not selected later
+		m_sprControllers[p].Load( THEME->GetPathTo("Graphics",ssprintf("select player controller selected p%d", p+1)) );
+		m_sprControllers[p].SetXY( CONTROLLER_X(p), CONTROLLER_Y(p) );
+		this->AddChild( &m_sprControllers[p] );
+		
 		if( GAMESTATE->m_bSideIsJoined[p] )	// if side is already joined
 			continue;	// don't show bobbing join and blob
 
-		m_sprControllers[p].Load( THEME->GetPathTo("Graphics","select player controller") );
-		m_sprControllers[p].SetXY( CONTROLLER_X(p), CONTROLLER_Y(p) );
-		this->AddChild( &m_sprControllers[p] );
+		m_sprControllers[p].Load( THEME->GetPathTo("Graphics",ssprintf("select player controller p%d", p+1)) );
 
 		m_sprCursors[p].Load( THEME->GetPathTo("Graphics",ssprintf("select player cursor p%d",p+1)) );
 		m_sprCursors[p].SetXY( CURSOR_X(p), CURSOR_Y(p) );
@@ -331,8 +338,11 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber pn )
 		m_soundSelect.Play();
 		m_sprCursors[pn].BeginTweening( 0.25f );
 		m_sprCursors[pn].SetTweenZoomY( 0 );
-		m_sprControllers[pn].BeginTweening( 0.25f );
-		m_sprControllers[pn].SetTweenZoomY( 0 );
+		//m_sprControllers[pn].BeginTweening( 0.25f );
+		//m_sprControllers[pn].SetTweenZoomY( 0 );
+		// NOW replace with the new controller!
+		m_sprControllers[pn].Load( THEME->GetPathTo("Graphics",ssprintf("select player controller selected p%d", pn+1)) );		
+
 		if (USE_METRIC_FOR_MENU == 1) // get it from the metrics
 		{		
 			RefreshStylesAndListFromMetrics();
diff --git a/stepmania/src/ScreenEz2SelectStyle.h b/stepmania/src/ScreenEz2SelectStyle.h
index b5eee9cb74..287fb682bc 100644
--- a/stepmania/src/ScreenEz2SelectStyle.h
+++ b/stepmania/src/ScreenEz2SelectStyle.h
@@ -62,4 +62,6 @@ protected:
 
 	RageSoundSample m_soundSelect;	
 	RageSoundSample m_soundChange;	
+
+	BackgroundAnimation	m_Background;	
 };