change elements to have format "<name> <piece>"
This commit is contained in:
@@ -0,0 +1 @@
|
||||
Common normal
|
||||
@@ -0,0 +1 @@
|
||||
_shared1
|
||||
@@ -0,0 +1 @@
|
||||
_shared2
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 7.0 KiB |
@@ -26,12 +26,12 @@ void BPMDisplay::Load()
|
||||
NO_BPM_TEXT.Load( m_sName, "NoBPMText" );
|
||||
|
||||
m_textBPM.SetName( "Text" );
|
||||
m_textBPM.LoadFromFont( THEME->GetPathToF(m_sName) );
|
||||
m_textBPM.LoadFromFont( THEME->GetPathF(m_sName,"bpm") );
|
||||
SET_XY_AND_ON_COMMAND( m_textBPM );
|
||||
m_textBPM.SetDiffuse( NORMAL_COLOR );
|
||||
this->AddChild( &m_textBPM );
|
||||
|
||||
m_sprLabel.Load( THEME->GetPathToG(ssprintf("%s label", m_sName.c_str())) );
|
||||
m_sprLabel.Load( THEME->GetPathG(m_sName,"label") );
|
||||
m_sprLabel->SetName( "Label" );
|
||||
SET_XY_AND_ON_COMMAND( m_sprLabel );
|
||||
m_sprLabel->SetDiffuse( NORMAL_COLOR );
|
||||
|
||||
@@ -16,7 +16,7 @@ HelpDisplay::HelpDisplay()
|
||||
void HelpDisplay::Load()
|
||||
{
|
||||
m_textTip.SetName( "Tip" );
|
||||
m_textTip.LoadFromFont( THEME->GetPathToF(m_sName) );
|
||||
m_textTip.LoadFromFont( THEME->GetPathF(m_sName,"text") );
|
||||
ON_COMMAND( m_textTip );
|
||||
this->AddChild( &m_textTip );
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ HoldJudgment::HoldJudgment()
|
||||
{
|
||||
m_iCount = 0;
|
||||
|
||||
m_sprJudgment.Load( THEME->GetPathToG("HoldJudgment 1x2") );
|
||||
m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") );
|
||||
m_sprJudgment.StopAnimating();
|
||||
Reset();
|
||||
this->AddChild( &m_sprJudgment );
|
||||
|
||||
@@ -33,7 +33,7 @@ Judgment::Judgment()
|
||||
{
|
||||
m_iCount = 0;
|
||||
|
||||
m_sprJudgment.Load( THEME->GetPathToG("Judgment 1x6") );
|
||||
m_sprJudgment.Load( THEME->GetPathG("Judgment","label 1x6") );
|
||||
m_sprJudgment.StopAnimating();
|
||||
Reset();
|
||||
this->AddChild( &m_sprJudgment );
|
||||
|
||||
@@ -24,8 +24,8 @@ MenuTimer::MenuTimer()
|
||||
m_fStallSecondsLeft = MAX_STALL_SECONDS;
|
||||
m_bPaused = false;
|
||||
|
||||
m_textDigit1.LoadFromFont( THEME->GetPathToF("MenuTimer") );
|
||||
m_textDigit2.LoadFromFont( THEME->GetPathToF("MenuTimer") );
|
||||
m_textDigit1.LoadFromFont( THEME->GetPathF("MenuTimer","numbers") );
|
||||
m_textDigit2.LoadFromFont( THEME->GetPathF("MenuTimer","numbers") );
|
||||
|
||||
const float fCharWidth = (float) m_textDigit1.m_pFont->GetLineWidthInSourcePixels(L"0");
|
||||
m_textDigit1.SetX( -fCharWidth/2 );
|
||||
@@ -36,7 +36,7 @@ MenuTimer::MenuTimer()
|
||||
|
||||
SetSeconds( TIMER_SECONDS );
|
||||
|
||||
m_soundBeep.Load( THEME->GetPathToS("MenuTimer tick") );
|
||||
m_soundBeep.Load( THEME->GetPathS("MenuTimer","tick") );
|
||||
}
|
||||
|
||||
void MenuTimer::EnableStealth( bool bStealth )
|
||||
@@ -44,7 +44,7 @@ void MenuTimer::EnableStealth( bool bStealth )
|
||||
if( bStealth )
|
||||
m_soundBeep.Unload(); // unload the sound
|
||||
else
|
||||
m_soundBeep.Load( THEME->GetPathToS("MenuTimer tick") ); // reload the sound
|
||||
m_soundBeep.Load( THEME->GetPathS("MenuTimer","tick") ); // reload the sound
|
||||
|
||||
m_textDigit1.SetHidden( bStealth );
|
||||
m_textDigit2.SetHidden( bStealth );
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
OptionIcon::OptionIcon()
|
||||
{
|
||||
m_spr.Load( THEME->GetPathToG("OptionIcon frame 3x2") );
|
||||
m_spr.Load( THEME->GetPathG("OptionIcon","frame 3x2") );
|
||||
m_spr.StopAnimating();
|
||||
this->AddChild( &m_spr );
|
||||
|
||||
m_text.LoadFromFont( THEME->GetPathToF("OptionIcon") );
|
||||
m_text.LoadFromFont( THEME->GetPathF("OptionIcon","text") );
|
||||
m_text.SetShadowLength( 0 );
|
||||
m_text.SetZoom( TEXT_ZOOM );
|
||||
m_text.SetXY( TEXT_OFFSET_X, TEXT_OFFSET_Y );
|
||||
|
||||
@@ -29,11 +29,11 @@ ScreenPrompt::ScreenPrompt( CString sText, bool bYesNoPrompt, bool bDefaultAnswe
|
||||
m_pOnNo = OnNo;
|
||||
m_pCallbackData = pCallbackData;
|
||||
|
||||
m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenPrompt background") );
|
||||
m_Background.LoadFromAniDir( THEME->GetPathB("ScreenPrompt","background") );
|
||||
m_Background.PlayCommand("On");
|
||||
this->AddChild( &m_Background );
|
||||
|
||||
m_textQuestion.LoadFromFont( THEME->GetPathToF("Common normal") );
|
||||
m_textQuestion.LoadFromFont( THEME->GetPathF("Common","normal") );
|
||||
m_textQuestion.SetText( sText );
|
||||
m_textQuestion.SetXY( QUESTION_X, QUESTION_Y );
|
||||
this->AddChild( &m_textQuestion );
|
||||
@@ -41,8 +41,8 @@ ScreenPrompt::ScreenPrompt( CString sText, bool bYesNoPrompt, bool bDefaultAnswe
|
||||
m_rectAnswerBox.SetDiffuse( RageColor(0.5f,0.5f,1.0f,0.7f) );
|
||||
this->AddChild( &m_rectAnswerBox );
|
||||
|
||||
m_textAnswer[0].LoadFromFont( THEME->GetPathToF("_shared1") );
|
||||
m_textAnswer[1].LoadFromFont( THEME->GetPathToF("_shared1") );
|
||||
m_textAnswer[0].LoadFromFont( THEME->GetPathF("ScreenPrompt","answer") );
|
||||
m_textAnswer[1].LoadFromFont( THEME->GetPathF("ScreenPrompt","answer") );
|
||||
m_textAnswer[0].SetY( PROMPT_Y );
|
||||
m_textAnswer[1].SetY( PROMPT_Y );
|
||||
this->AddChild( &m_textAnswer[0] );
|
||||
@@ -69,11 +69,11 @@ ScreenPrompt::ScreenPrompt( CString sText, bool bYesNoPrompt, bool bDefaultAnswe
|
||||
|
||||
m_textAnswer[m_bAnswer].SetEffectGlowShift();
|
||||
|
||||
m_In.Load( THEME->GetPathToB("ScreenPrompt in") );
|
||||
m_In.Load( THEME->GetPathB("ScreenPrompt","in") );
|
||||
m_In.StartTransitioning();
|
||||
this->AddChild( &m_In );
|
||||
|
||||
m_Out.Load( THEME->GetPathToB("ScreenPrompt out") );
|
||||
m_Out.Load( THEME->GetPathB("ScreenPrompt","out") );
|
||||
this->AddChild( &m_Out );
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ void ScreenPrompt::MenuRight( PlayerNumber pn )
|
||||
m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() );
|
||||
m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetUnzoomedWidth()+10.0f );
|
||||
|
||||
SOUND->PlayOnce( THEME->GetPathToS("ScreenPrompt change") );
|
||||
SOUND->PlayOnce( THEME->GetPathS("ScreenPrompt","change") );
|
||||
}
|
||||
|
||||
void ScreenPrompt::MenuStart( PlayerNumber pn )
|
||||
|
||||
@@ -27,17 +27,17 @@ void TextBanner::Init()
|
||||
ASSERT( m_sName != "" );
|
||||
|
||||
m_textTitle.SetName( "Title" );
|
||||
m_textTitle.LoadFromFont( THEME->GetPathToF("TextBanner") );
|
||||
m_textTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") );
|
||||
SET_XY_AND_ON_COMMAND( m_textTitle );
|
||||
this->AddChild( &m_textTitle );
|
||||
|
||||
m_textSubTitle.SetName( "Subtitle" );
|
||||
m_textSubTitle.LoadFromFont( THEME->GetPathToF("TextBanner") );
|
||||
m_textSubTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") );
|
||||
SET_XY_AND_ON_COMMAND( m_textSubTitle );
|
||||
this->AddChild( &m_textSubTitle );
|
||||
|
||||
m_textArtist.SetName( "Artist" );
|
||||
m_textArtist.LoadFromFont( THEME->GetPathToF("TextBanner") );
|
||||
m_textArtist.LoadFromFont( THEME->GetPathF("TextBanner","text") );
|
||||
SET_XY_AND_ON_COMMAND( m_textArtist );
|
||||
this->AddChild( &m_textArtist );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user