para theme stuff
This commit is contained in:
@@ -10,6 +10,15 @@
|
|||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
TODO:
|
||||||
|
1. FIX TIMER
|
||||||
|
2. MAKE 2PLAYER SUPPORT WORK CORRECTLY
|
||||||
|
3. FIX THE MODE SWITCHER FOR EXTRAMIX FOR 2 PLAYER
|
||||||
|
3a. MAKE IT METRICABLE
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "MusicBannerWheel.h"
|
#include "MusicBannerWheel.h"
|
||||||
#include "RageUtil.h"
|
#include "RageUtil.h"
|
||||||
#include "GameState.h"
|
#include "GameState.h"
|
||||||
|
|||||||
@@ -93,11 +93,6 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
|||||||
m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
|
m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
|
||||||
this->AddChild( &m_ChoiceListFrame );
|
this->AddChild( &m_ChoiceListFrame );
|
||||||
|
|
||||||
m_Guide.Load( THEME->GetPathToG("ScreenEz2SelectMusic guide"));
|
|
||||||
m_Guide.SetXY( GUIDE_X, GUIDE_Y );
|
|
||||||
this->AddChild( &m_Guide );
|
|
||||||
|
|
||||||
|
|
||||||
m_MusicBannerWheel.SetX(SCROLLING_LIST_X);
|
m_MusicBannerWheel.SetX(SCROLLING_LIST_X);
|
||||||
m_MusicBannerWheel.SetY(SCROLLING_LIST_Y);
|
m_MusicBannerWheel.SetY(SCROLLING_LIST_Y);
|
||||||
|
|
||||||
@@ -152,6 +147,10 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
|||||||
m_iSelection[p] = 0;
|
m_iSelection[p] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_Guide.Load( THEME->GetPathToG("ScreenEz2SelectMusic guide"));
|
||||||
|
m_Guide.SetXY( GUIDE_X, GUIDE_Y );
|
||||||
|
this->AddChild( &m_Guide );
|
||||||
|
|
||||||
m_InfoFrame.Load( THEME->GetPathToG("ScreenEz2SelectMusic infoframe") );
|
m_InfoFrame.Load( THEME->GetPathToG("ScreenEz2SelectMusic infoframe") );
|
||||||
m_InfoFrame.SetXY( INFOFRAME_X, INFOFRAME_Y );
|
m_InfoFrame.SetXY( INFOFRAME_X, INFOFRAME_Y );
|
||||||
this->AddChild( &m_InfoFrame );
|
this->AddChild( &m_InfoFrame );
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ protected:
|
|||||||
|
|
||||||
MenuElements m_Menu;
|
MenuElements m_Menu;
|
||||||
BGAnimation m_BGAnimations[MAX_CHOICES];
|
BGAnimation m_BGAnimations[MAX_CHOICES];
|
||||||
|
|
||||||
vector<ModeChoice> m_aModeChoices; // derived classes should look here for what choices are available
|
vector<ModeChoice> m_aModeChoices; // derived classes should look here for what choices are available
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user