make calls to THEME->GetPathTo() more concise
This commit is contained in:
@@ -70,15 +70,15 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
||||
m_Menu.Load("ScreenSelectMusic");
|
||||
this->AddChild( &m_Menu );
|
||||
|
||||
m_soundMusicChange.Load( THEME->GetPathTo("Sounds","ScreenEz2SelectMusic change"));
|
||||
m_soundMusicCycle.Load( THEME->GetPathTo("Sounds","ScreenEz2SelectMusic cycle"));
|
||||
m_soundSelect.Load( THEME->GetPathTo("Sounds","Common start") );
|
||||
m_soundMusicChange.Load( THEME->GetPathToS("ScreenEz2SelectMusic change"));
|
||||
m_soundMusicCycle.Load( THEME->GetPathToS("ScreenEz2SelectMusic cycle"));
|
||||
m_soundSelect.Load( THEME->GetPathToS("Common start") );
|
||||
|
||||
m_ChoiceListFrame.Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic list frame"));
|
||||
m_ChoiceListFrame.Load( THEME->GetPathToG("ScreenEz2SelectMusic list frame"));
|
||||
m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
|
||||
this->AddChild( &m_ChoiceListFrame );
|
||||
|
||||
m_Guide.Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic guide"));
|
||||
m_Guide.Load( THEME->GetPathToG("ScreenEz2SelectMusic guide"));
|
||||
m_Guide.SetXY( GUIDE_X, GUIDE_Y );
|
||||
this->AddChild( &m_Guide );
|
||||
|
||||
@@ -91,12 +91,12 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
||||
this->AddChild( &m_MusicBannerWheel );
|
||||
|
||||
|
||||
m_ChoiceListHighlight.Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic list highlight"));
|
||||
m_ChoiceListHighlight.Load( THEME->GetPathToG("ScreenEz2SelectMusic list highlight"));
|
||||
m_ChoiceListHighlight.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
|
||||
this->AddChild( &m_ChoiceListHighlight );
|
||||
|
||||
#ifdef DEBUG
|
||||
m_debugtext.LoadFromFont( THEME->GetPathTo("Fonts","small titles") );
|
||||
m_debugtext.LoadFromFont( THEME->GetPathToF("small titles") );
|
||||
m_debugtext.SetXY( CENTER_X, CENTER_Y );
|
||||
this->AddChild(&m_debugtext);
|
||||
#endif
|
||||
@@ -107,17 +107,17 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
||||
// m_FootMeter[p].SetShadowLength( 2 );
|
||||
// this->AddChild( &m_FootMeter[p] );
|
||||
|
||||
m_SpeedIcon[p].Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic speedicon"));
|
||||
m_SpeedIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic speedicon"));
|
||||
m_SpeedIcon[p].SetXY( SPEEDICON_X(p), SPEEDICON_Y(p) );
|
||||
m_SpeedIcon[p].SetDiffuse( RageColor(0,0,0,0) );
|
||||
this->AddChild(&m_SpeedIcon[p] );
|
||||
|
||||
m_MirrorIcon[p].Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic mirroricon"));
|
||||
m_MirrorIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic mirroricon"));
|
||||
m_MirrorIcon[p].SetXY( MIRRORICON_X(p), MIRRORICON_Y(p) );
|
||||
m_MirrorIcon[p].SetDiffuse( RageColor(0,0,0,0) );
|
||||
this->AddChild(&m_MirrorIcon[p] );
|
||||
|
||||
m_ShuffleIcon[p].Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic shuffleicon"));
|
||||
m_ShuffleIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic shuffleicon"));
|
||||
m_ShuffleIcon[p].SetXY( SHUFFLEICON_X(p), SHUFFLEICON_Y(p) );
|
||||
m_ShuffleIcon[p].SetDiffuse( RageColor(0,0,0,0) );
|
||||
this->AddChild(&m_ShuffleIcon[p] );
|
||||
@@ -127,15 +127,15 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
||||
m_iSelection[p] = 0;
|
||||
}
|
||||
|
||||
m_InfoFrame.Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic infoframe") );
|
||||
m_InfoFrame.Load( THEME->GetPathToG("ScreenEz2SelectMusic infoframe") );
|
||||
m_InfoFrame.SetXY( INFOFRAME_X, INFOFRAME_Y );
|
||||
this->AddChild( &m_InfoFrame );
|
||||
|
||||
m_PumpDifficultyCircle.Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic difficulty frame"));
|
||||
m_PumpDifficultyCircle.Load( THEME->GetPathToG("ScreenEz2SelectMusic difficulty frame"));
|
||||
m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
|
||||
this->AddChild( &m_PumpDifficultyCircle );
|
||||
|
||||
m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","ScreenEz2SelectMusic difficulty") );
|
||||
m_PumpDifficultyRating.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic difficulty") );
|
||||
m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
|
||||
this->AddChild(&m_PumpDifficultyRating);
|
||||
|
||||
@@ -144,14 +144,14 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
||||
m_DifficultyRating.SetY(DIFFICULTYRATING_Y);
|
||||
this->AddChild(&m_DifficultyRating);
|
||||
|
||||
m_sprOptionsMessage.Load( THEME->GetPathTo("Graphics","ScreenEz2SelectMusic options message") );
|
||||
m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenEz2SelectMusic options message") );
|
||||
m_sprOptionsMessage.StopAnimating();
|
||||
m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
|
||||
m_sprOptionsMessage.SetZoom( 1 );
|
||||
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
|
||||
this->AddChild( &m_sprOptionsMessage );
|
||||
|
||||
m_soundOptionsChange.Load( THEME->GetPathTo("Sounds","ScreenEz2SelectMusic options") );
|
||||
m_soundOptionsChange.Load( THEME->GetPathToS("ScreenEz2SelectMusic options") );
|
||||
|
||||
m_bGoToOptions = false;
|
||||
m_bMadeChoice = false;
|
||||
@@ -175,7 +175,7 @@ void ScreenEz2SelectMusic::Input( const DeviceInput& DeviceI, const InputEventTy
|
||||
|
||||
if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START )
|
||||
{
|
||||
SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","Common start") );
|
||||
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common start") );
|
||||
m_bGoToOptions = true;
|
||||
m_sprOptionsMessage.SetState( 1 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user