diff --git a/stepmania/Themes/default/Fonts/HelpDisplay text.redir b/stepmania/Themes/default/Fonts/HelpDisplay text.redir new file mode 100644 index 0000000000..ca24092074 --- /dev/null +++ b/stepmania/Themes/default/Fonts/HelpDisplay text.redir @@ -0,0 +1 @@ +Common normal diff --git a/stepmania/Themes/default/Fonts/ScreenPrompt answer.redir b/stepmania/Themes/default/Fonts/ScreenPrompt answer.redir new file mode 100644 index 0000000000..6c015f9d4b --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenPrompt answer.redir @@ -0,0 +1 @@ +_shared1 diff --git a/stepmania/Themes/default/Fonts/TextBanner text.redir b/stepmania/Themes/default/Fonts/TextBanner text.redir new file mode 100644 index 0000000000..ba41a9d72b --- /dev/null +++ b/stepmania/Themes/default/Fonts/TextBanner text.redir @@ -0,0 +1 @@ +_shared2 diff --git a/stepmania/Themes/default/Graphics/HoldJudgment label 1x2.png b/stepmania/Themes/default/Graphics/HoldJudgment label 1x2.png new file mode 100644 index 0000000000..6e62847d20 Binary files /dev/null and b/stepmania/Themes/default/Graphics/HoldJudgment label 1x2.png differ diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp index 06be8489e9..25a0b124f6 100644 --- a/stepmania/src/BPMDisplay.cpp +++ b/stepmania/src/BPMDisplay.cpp @@ -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 ); diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp index 1fe68bb2cb..7f6715ea37 100644 --- a/stepmania/src/HelpDisplay.cpp +++ b/stepmania/src/HelpDisplay.cpp @@ -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 ); diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp index b539c70840..051739f02d 100644 --- a/stepmania/src/HoldJudgment.cpp +++ b/stepmania/src/HoldJudgment.cpp @@ -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 ); diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp index 817982c3ca..165970746c 100644 --- a/stepmania/src/Judgment.cpp +++ b/stepmania/src/Judgment.cpp @@ -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 ); diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp index 62eb3037a4..ce9a641119 100644 --- a/stepmania/src/MenuTimer.cpp +++ b/stepmania/src/MenuTimer.cpp @@ -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 ); diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp index 21954f4ebb..9d457c6c5c 100644 --- a/stepmania/src/OptionIcon.cpp +++ b/stepmania/src/OptionIcon.cpp @@ -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 ); diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 22d3c9664c..d79b2876fc 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -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 ) diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp index 675cc03e0a..f5e1b365c7 100644 --- a/stepmania/src/TextBanner.cpp +++ b/stepmania/src/TextBanner.cpp @@ -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 ); }