From 55e1a75d7c652ad15402042f96c8e2dbe3321886 Mon Sep 17 00:00:00 2001
From: Andrew Livy <frieza@users.sourceforge.net>
Date: Sun, 26 Jan 2003 00:31:33 +0000
Subject: [PATCH] Starting to look a bit like para music select YAY!

---
 stepmania/Themes/default/metrics.ini   | 2 ++
 stepmania/src/DifficultyRating.cpp     | 8 ++++----
 stepmania/src/ScreenEz2SelectMusic.cpp | 6 ++++++
 stepmania/src/ScreenEz2SelectMusic.h   | 3 ++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 0aa3b38251..0c41f665a0 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -254,6 +254,8 @@ ShuffleIconP1X=40
 ShuffleIconP2X=600
 ShuffleIconP1Y=320
 ShuffleIconP2Y=320
+InfoFrameX=999
+InfoFrameY=999
 DifficultyRatingX=999
 DifficultyRatingY=999
 DifficultyRatingOrientation=0
diff --git a/stepmania/src/DifficultyRating.cpp b/stepmania/src/DifficultyRating.cpp
index d7680a881b..0ea04258ab 100644
--- a/stepmania/src/DifficultyRating.cpp
+++ b/stepmania/src/DifficultyRating.cpp
@@ -71,18 +71,18 @@ void DifficultyRating::SetOrientation(int Orientation)
 		{
 			//damn! in that case everything is to the side of the middle....
 			int incrementor=1; // start on one... 0 is reserved for 'central' (read odd number)
-			int offset=0;
+			int offset=0.5f;
 			for(int i=0; i<iMaxElements; i++)
 			{
 				if(incrementor == 1) // + offset
 				{
-					m_apSprites[i]->SetX((0 - 0.5f) + offset);
+					m_apSprites[i]->SetX(0  + offset);
 					incrementor++;
 				}
 				else // - offset
 				{
-					m_apSprites[i]->SetX((0 + 0.5f) - offset);
-					offset += ELEMSPACING; // increase offset
+					m_apSprites[i]->SetX(0 - offset);
+					offset += ELEMSPACING + 0.5f; // increase offset
 					incrementor=1;
 				}
 			}			
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 46249a3ff0..62eaf60abe 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -50,6 +50,8 @@
 #define DIFFICULTYRATING_X		THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingX")
 #define DIFFICULTYRATING_Y		THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingY")
 #define DIFFICULTYRATING_ORIENTATION		THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingOrientation")
+#define INFOFRAME_X		THEME->GetMetricF("ScreenEz2SelectMusic","InfoFrameX")
+#define INFOFRAME_Y		THEME->GetMetricF("ScreenEz2SelectMusic","InfoFrameY")
 
 const float TWEEN_TIME		= 0.5f;
 
@@ -133,6 +135,10 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
 			m_iSelection[p] = 0;
 		}
 
+		m_InfoFrame.Load( THEME->GetPathTo("Graphics","select music infoframe") );
+		m_InfoFrame.SetXY( INFOFRAME_X, INFOFRAME_Y );
+		this->AddChild( &m_InfoFrame );
+
 		m_PumpDifficultyCircle.Load( THEME->GetPathTo("Graphics","select music pump difficulty circle"));
 		m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
 		this->AddChild( &m_PumpDifficultyCircle );
diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h
index 1d66b4a359..6d09bdaa98 100644
--- a/stepmania/src/ScreenEz2SelectMusic.h
+++ b/stepmania/src/ScreenEz2SelectMusic.h
@@ -54,7 +54,8 @@ protected:
 	Sprite  m_ChoiceListFrame;
 	Sprite  m_ChoiceListHighlight;
 	Sprite  m_Guide;
-	Sprite				m_sprOptionsMessage;
+	Sprite	m_sprOptionsMessage;
+	Sprite	m_InfoFrame;
 	Sprite  m_PumpDifficultyCircle;
 	Sprite	m_SpeedIcon[NUM_PLAYERS];
 	Sprite	m_MirrorIcon[NUM_PLAYERS];