Starting to look a bit like para music select YAY!

This commit is contained in:
Andrew Livy
2003-01-26 00:31:33 +00:00
parent 6723b6fdb1
commit 55e1a75d7c
4 changed files with 14 additions and 5 deletions
+2
View File
@@ -254,6 +254,8 @@ ShuffleIconP1X=40
ShuffleIconP2X=600 ShuffleIconP2X=600
ShuffleIconP1Y=320 ShuffleIconP1Y=320
ShuffleIconP2Y=320 ShuffleIconP2Y=320
InfoFrameX=999
InfoFrameY=999
DifficultyRatingX=999 DifficultyRatingX=999
DifficultyRatingY=999 DifficultyRatingY=999
DifficultyRatingOrientation=0 DifficultyRatingOrientation=0
+4 -4
View File
@@ -71,18 +71,18 @@ void DifficultyRating::SetOrientation(int Orientation)
{ {
//damn! in that case everything is to the side of the middle.... //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 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++) for(int i=0; i<iMaxElements; i++)
{ {
if(incrementor == 1) // + offset if(incrementor == 1) // + offset
{ {
m_apSprites[i]->SetX((0 - 0.5f) + offset); m_apSprites[i]->SetX(0 + offset);
incrementor++; incrementor++;
} }
else // - offset else // - offset
{ {
m_apSprites[i]->SetX((0 + 0.5f) - offset); m_apSprites[i]->SetX(0 - offset);
offset += ELEMSPACING; // increase offset offset += ELEMSPACING + 0.5f; // increase offset
incrementor=1; incrementor=1;
} }
} }
+6
View File
@@ -50,6 +50,8 @@
#define DIFFICULTYRATING_X THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingX") #define DIFFICULTYRATING_X THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingX")
#define DIFFICULTYRATING_Y THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingY") #define DIFFICULTYRATING_Y THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingY")
#define DIFFICULTYRATING_ORIENTATION THEME->GetMetricF("ScreenEz2SelectMusic","DifficultyRatingOrientation") #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; const float TWEEN_TIME = 0.5f;
@@ -133,6 +135,10 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
m_iSelection[p] = 0; 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.Load( THEME->GetPathTo("Graphics","select music pump difficulty circle"));
m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y ); m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
this->AddChild( &m_PumpDifficultyCircle ); this->AddChild( &m_PumpDifficultyCircle );
+1
View File
@@ -55,6 +55,7 @@ protected:
Sprite m_ChoiceListHighlight; Sprite m_ChoiceListHighlight;
Sprite m_Guide; Sprite m_Guide;
Sprite m_sprOptionsMessage; Sprite m_sprOptionsMessage;
Sprite m_InfoFrame;
Sprite m_PumpDifficultyCircle; Sprite m_PumpDifficultyCircle;
Sprite m_SpeedIcon[NUM_PLAYERS]; Sprite m_SpeedIcon[NUM_PLAYERS];
Sprite m_MirrorIcon[NUM_PLAYERS]; Sprite m_MirrorIcon[NUM_PLAYERS];