actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change elements to have format "<name> <piece>"

Browse Source
This commit is contained in:
Chris Danford
2005-02-06 03:28:22 +00:00
parent 544dd78497
commit 7e68ac03b4
12 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Fonts/HelpDisplay text.redir
+1
View File
@@ -0,0 +1 @@
Common normal
stepmania/Themes/default/Fonts/ScreenPrompt answer.redir
+1
View File
@@ -0,0 +1 @@
_shared1
stepmania/Themes/default/Fonts/TextBanner text.redir
+1
View File
@@ -0,0 +1 @@
_shared2
stepmania/Themes/default/Graphics/HoldJudgment label 1x2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

stepmania/src/BPMDisplay.cpp
+2 -2
View File
@@ -26,12 +26,12 @@ void BPMDisplay::Load()
NO_BPM_TEXT.Load( m_sName, "NoBPMText" ); NO_BPM_TEXT.Load( m_sName, "NoBPMText" );
m_textBPM.SetName( "Text" ); 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 ); SET_XY_AND_ON_COMMAND( m_textBPM );
m_textBPM.SetDiffuse( NORMAL_COLOR ); m_textBPM.SetDiffuse( NORMAL_COLOR );
this->AddChild( &m_textBPM ); 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" ); m_sprLabel->SetName( "Label" );
SET_XY_AND_ON_COMMAND( m_sprLabel ); SET_XY_AND_ON_COMMAND( m_sprLabel );
m_sprLabel->SetDiffuse( NORMAL_COLOR ); m_sprLabel->SetDiffuse( NORMAL_COLOR );
stepmania/src/HelpDisplay.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ HelpDisplay::HelpDisplay()
void HelpDisplay::Load() void HelpDisplay::Load()
{ {
m_textTip.SetName( "Tip" ); m_textTip.SetName( "Tip" );
m_textTip.LoadFromFont( THEME->GetPathToF(m_sName) ); m_textTip.LoadFromFont( THEME->GetPathF(m_sName,"text") );
ON_COMMAND( m_textTip ); ON_COMMAND( m_textTip );
this->AddChild( &m_textTip ); this->AddChild( &m_textTip );
stepmania/src/HoldJudgment.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ HoldJudgment::HoldJudgment()
{ {
m_iCount = 0; m_iCount = 0;
m_sprJudgment.Load( THEME->GetPathToG("HoldJudgment 1x2") ); m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") );
m_sprJudgment.StopAnimating(); m_sprJudgment.StopAnimating();
Reset(); Reset();
this->AddChild( &m_sprJudgment ); this->AddChild( &m_sprJudgment );
stepmania/src/Judgment.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ Judgment::Judgment()
{ {
m_iCount = 0; m_iCount = 0;
m_sprJudgment.Load( THEME->GetPathToG("Judgment 1x6") ); m_sprJudgment.Load( THEME->GetPathG("Judgment","label 1x6") );
m_sprJudgment.StopAnimating(); m_sprJudgment.StopAnimating();
Reset(); Reset();
this->AddChild( &m_sprJudgment ); this->AddChild( &m_sprJudgment );
stepmania/src/MenuTimer.cpp
+4 -4
View File
@@ -24,8 +24,8 @@ MenuTimer::MenuTimer()
m_fStallSecondsLeft = MAX_STALL_SECONDS; m_fStallSecondsLeft = MAX_STALL_SECONDS;
m_bPaused = false; m_bPaused = false;
m_textDigit1.LoadFromFont( THEME->GetPathToF("MenuTimer") ); m_textDigit1.LoadFromFont( THEME->GetPathF("MenuTimer","numbers") );
m_textDigit2.LoadFromFont( THEME->GetPathToF("MenuTimer") ); m_textDigit2.LoadFromFont( THEME->GetPathF("MenuTimer","numbers") );
const float fCharWidth = (float) m_textDigit1.m_pFont->GetLineWidthInSourcePixels(L"0"); const float fCharWidth = (float) m_textDigit1.m_pFont->GetLineWidthInSourcePixels(L"0");
m_textDigit1.SetX( -fCharWidth/2 ); m_textDigit1.SetX( -fCharWidth/2 );
@@ -36,7 +36,7 @@ MenuTimer::MenuTimer()
SetSeconds( TIMER_SECONDS ); SetSeconds( TIMER_SECONDS );
m_soundBeep.Load( THEME->GetPathToS("MenuTimer tick") ); m_soundBeep.Load( THEME->GetPathS("MenuTimer","tick") );
} }
void MenuTimer::EnableStealth( bool bStealth ) void MenuTimer::EnableStealth( bool bStealth )
@@ -44,7 +44,7 @@ void MenuTimer::EnableStealth( bool bStealth )
if( bStealth ) if( bStealth )
m_soundBeep.Unload(); // unload the sound m_soundBeep.Unload(); // unload the sound
else 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_textDigit1.SetHidden( bStealth );
m_textDigit2.SetHidden( bStealth ); m_textDigit2.SetHidden( bStealth );
stepmania/src/OptionIcon.cpp
+2 -2
View File
@@ -15,11 +15,11 @@
OptionIcon::OptionIcon() OptionIcon::OptionIcon()
{ {
m_spr.Load( THEME->GetPathToG("OptionIcon frame 3x2") ); m_spr.Load( THEME->GetPathG("OptionIcon","frame 3x2") );
m_spr.StopAnimating(); m_spr.StopAnimating();
this->AddChild( &m_spr ); this->AddChild( &m_spr );
m_text.LoadFromFont( THEME->GetPathToF("OptionIcon") ); m_text.LoadFromFont( THEME->GetPathF("OptionIcon","text") );
m_text.SetShadowLength( 0 ); m_text.SetShadowLength( 0 );
m_text.SetZoom( TEXT_ZOOM ); m_text.SetZoom( TEXT_ZOOM );
m_text.SetXY( TEXT_OFFSET_X, TEXT_OFFSET_Y ); m_text.SetXY( TEXT_OFFSET_X, TEXT_OFFSET_Y );
stepmania/src/ScreenPrompt.cpp
+7 -7
View File
@@ -29,11 +29,11 @@ ScreenPrompt::ScreenPrompt( CString sText, bool bYesNoPrompt, bool bDefaultAnswe
m_pOnNo = OnNo; m_pOnNo = OnNo;
m_pCallbackData = pCallbackData; m_pCallbackData = pCallbackData;
m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenPrompt background") ); m_Background.LoadFromAniDir( THEME->GetPathB("ScreenPrompt","background") );
m_Background.PlayCommand("On"); m_Background.PlayCommand("On");
this->AddChild( &m_Background ); this->AddChild( &m_Background );
m_textQuestion.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textQuestion.LoadFromFont( THEME->GetPathF("Common","normal") );
m_textQuestion.SetText( sText ); m_textQuestion.SetText( sText );
m_textQuestion.SetXY( QUESTION_X, QUESTION_Y ); m_textQuestion.SetXY( QUESTION_X, QUESTION_Y );
this->AddChild( &m_textQuestion ); 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) ); m_rectAnswerBox.SetDiffuse( RageColor(0.5f,0.5f,1.0f,0.7f) );
this->AddChild( &m_rectAnswerBox ); this->AddChild( &m_rectAnswerBox );
m_textAnswer[0].LoadFromFont( THEME->GetPathToF("_shared1") ); m_textAnswer[0].LoadFromFont( THEME->GetPathF("ScreenPrompt","answer") );
m_textAnswer[1].LoadFromFont( THEME->GetPathToF("_shared1") ); m_textAnswer[1].LoadFromFont( THEME->GetPathF("ScreenPrompt","answer") );
m_textAnswer[0].SetY( PROMPT_Y ); m_textAnswer[0].SetY( PROMPT_Y );
m_textAnswer[1].SetY( PROMPT_Y ); m_textAnswer[1].SetY( PROMPT_Y );
this->AddChild( &m_textAnswer[0] ); this->AddChild( &m_textAnswer[0] );
@@ -69,11 +69,11 @@ ScreenPrompt::ScreenPrompt( CString sText, bool bYesNoPrompt, bool bDefaultAnswe
m_textAnswer[m_bAnswer].SetEffectGlowShift(); m_textAnswer[m_bAnswer].SetEffectGlowShift();
m_In.Load( THEME->GetPathToB("ScreenPrompt in") ); m_In.Load( THEME->GetPathB("ScreenPrompt","in") );
m_In.StartTransitioning(); m_In.StartTransitioning();
this->AddChild( &m_In ); this->AddChild( &m_In );
m_Out.Load( THEME->GetPathToB("ScreenPrompt out") ); m_Out.Load( THEME->GetPathB("ScreenPrompt","out") );
this->AddChild( &m_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.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() );
m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetUnzoomedWidth()+10.0f ); 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 ) void ScreenPrompt::MenuStart( PlayerNumber pn )
stepmania/src/TextBanner.cpp
+3 -3
View File
@@ -27,17 +27,17 @@ void TextBanner::Init()
ASSERT( m_sName != "" ); ASSERT( m_sName != "" );
m_textTitle.SetName( "Title" ); m_textTitle.SetName( "Title" );
m_textTitle.LoadFromFont( THEME->GetPathToF("TextBanner") ); m_textTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") );
SET_XY_AND_ON_COMMAND( m_textTitle ); SET_XY_AND_ON_COMMAND( m_textTitle );
this->AddChild( &m_textTitle ); this->AddChild( &m_textTitle );
m_textSubTitle.SetName( "Subtitle" ); m_textSubTitle.SetName( "Subtitle" );
m_textSubTitle.LoadFromFont( THEME->GetPathToF("TextBanner") ); m_textSubTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") );
SET_XY_AND_ON_COMMAND( m_textSubTitle ); SET_XY_AND_ON_COMMAND( m_textSubTitle );
this->AddChild( &m_textSubTitle ); this->AddChild( &m_textSubTitle );
m_textArtist.SetName( "Artist" ); m_textArtist.SetName( "Artist" );
m_textArtist.LoadFromFont( THEME->GetPathToF("TextBanner") ); m_textArtist.LoadFromFont( THEME->GetPathF("TextBanner","text") );
SET_XY_AND_ON_COMMAND( m_textArtist ); SET_XY_AND_ON_COMMAND( m_textArtist );
this->AddChild( &m_textArtist ); this->AddChild( &m_textArtist );
} }