From 7e68ac03b4f8fbf1d6d060cd511ae75d4269adc1 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 6 Feb 2005 03:28:22 +0000 Subject: [PATCH] change elements to have format " " --- .../Themes/default/Fonts/HelpDisplay text.redir | 1 + .../default/Fonts/ScreenPrompt answer.redir | 1 + .../Themes/default/Fonts/TextBanner text.redir | 1 + .../default/Graphics/HoldJudgment label 1x2.png | Bin 0 -> 7196 bytes stepmania/src/BPMDisplay.cpp | 4 ++-- stepmania/src/HelpDisplay.cpp | 2 +- stepmania/src/HoldJudgment.cpp | 2 +- stepmania/src/Judgment.cpp | 2 +- stepmania/src/MenuTimer.cpp | 8 ++++---- stepmania/src/OptionIcon.cpp | 4 ++-- stepmania/src/ScreenPrompt.cpp | 14 +++++++------- stepmania/src/TextBanner.cpp | 6 +++--- 12 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 stepmania/Themes/default/Fonts/HelpDisplay text.redir create mode 100644 stepmania/Themes/default/Fonts/ScreenPrompt answer.redir create mode 100644 stepmania/Themes/default/Fonts/TextBanner text.redir create mode 100644 stepmania/Themes/default/Graphics/HoldJudgment label 1x2.png 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 0000000000000000000000000000000000000000..6e62847d20a3fcfe4b3ad101e5c1c5ec0060a2bb GIT binary patch literal 7196 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%0Ac3cvF zchvVMhPjg~tnAo}Hv;(2|1ZFqU`8Z304f7_DS@ZP9!BD(F|1s6!H^8)5delPs3#tH zeDR{b?zy#z6c{)xX+bOf{vZ7C{(rme*4rmvHzNo#A|b#lfLn0Tlid&Jx?!xlaM@rO z$d>>Z%MtqV-|X!eJhFOOS8@pm43@N!SLPEx{>hKN|G`^6lzZF2g(cu5?BemVE*4P^ z3i)v?>zdzFZP#6Q$6wv?N@@K4_pP~CB2E%A;ZR@FV>#x22!?%~+<;<~x8}tc(o0G637xOs)%n8FF0pRTew}cHR z5rZ*$O5@ChNDC;Xd+xYn3N!#5dHE$%bwv`6<$!@h6a4QfzJO8|; zwdFmDxi03;SvRV+4&JPuIJfUVD{#&^Y}texCxFTf1p`e*^_&o{0V@c{P?FodM7kug@SkbuDk9Ue>07jZcmhfZ{50e zmXi_%#sOnEjG-vI@~EbrtyJZVg9`!137i08Zw{Pu4#t>aJmLr?;9LO22@~0g>g%^& zcSWkEp;;+8b(Mv4c%Byyjh+4D6FZ)K@w{BBScH{o24f7wEw|hTL=vFJF-7zM`Y4KK@$r_-!e8;5g187k9Y&H!!^UO9IBqw@zY|HO)L zErmu+#Y!TOk=WDsd%12+_eTys_w0FBI;EpzB7(^0^D}|Bcac^R@bh_sAed$e$vwzr(l`uqE*0sr@} zeTB3J(^>;M0!|<(FlZa^T#f5T5IPZQ~)y^gs->ZGg8m~0n=;x^mxJIdB4NNc~D6K$5 zGg6?Eic2XG1_2DSA*DKx2Caco8ess0awH?rAqYYk zif%L$Q8H?3zKwdEh!C%JV6;Z)2W3V@AV{sDj06##o{^KYUR+CETo6GOn~a>ladgy5 zAqeC-z$Jpvo7G}C=PV3DgnlGPD^<)kgtrWQa&mGS@LZT-ju(rCLPE2!44f2)iZt0f z^A5W~-~|YT4?_mNUjXN9Mh~p=nHZTwkd!1ni6FYDSWIUQq?EIQ@jcIyzC^%%Xfg;w zAB@qs<2d2@q_JthONZ$t;1k&~V!pHj9zanr1zdAzsX#=0W^3KR&j;{XaY23n&N&qd zh1aE$R?IS9-h*EV;D>%is_`Jh*@NT6_=KzKG(32)2=F~0)t2?gTRw10`i+2}J$v@e zH7;TTT59cOJ!mG&z##z*HLDi$lZ7f-knkyh0w8?}##yfC)!vKNw_W+yK~BZW{W4Cf zYeT~?7c83hK%v(&{-g(A1r@yChYl1h+YM%Gkc7Dqz6_uNs6fH8t^BRGeQ4cFkDdCI z$?+Nu9VtqfaM_ieKmN&sKl<+@M~=+o>Xo}eM5t~|Fw0YxG!l}6ayv*%K)HHW=B7f$ zWL_fFAq)ti7eH{ua>w|mZnwX1bzLe2U1TXXVtC}0uWv%?=x=RiOFtV->*0a&XqAhx z|Ivpoi2q$;iKkri zH9WeAq&eEme2`BFO#lV~BQ>&xNq6#O7)vJVrpbvTj+kFvcftB~Yb?up=3Gmi(Pf=C zZ(bk=3K=s-Z8nd?z<_}v=jY%hv#|Kgg3ef>7iK~@ZX8Tom<%V-Js6awNK>!fiK?dXKNF*d;(uCt7 z5+VtO=n|4v1_hB7iA3k$Dy6obd-Y6s-gKI~{fFEA^{Y1i;3xfG_;j^XTce@Dz%fCi zXjpAf<<`ugZfS9L+r#|6>s!LEb_I!vMJKUw&SvkaV+a2Iq3|nTsulIA2sne(0lW+Q zaQ*6Q(!YN3_ussK|Gl3~#%pQ}^m(VE(s%q-{a8BpS{mGx{;wZD_%CZ(+|FiA3JeUM zDuAs|Bb8X&Y>Sy`p3Lj?ZLWUzm5rOXT=SVA2v-6IoCNCP4T?aYzx(dHcb_}{iY=R} zF2CyX+ilCfvD&Rgb*yIJt+(C!*(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 ); }