From 9a3c6a0289b5d7166d9b2e8aeb62be813bf75cbb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 31 May 2005 07:53:13 +0000 Subject: [PATCH] more m_sID --- stepmania/src/HelpDisplay.cpp | 10 +++++----- stepmania/src/HelpDisplay.h | 2 +- stepmania/src/ScreenSelectMusic.cpp | 2 +- stepmania/src/ScreenWithMenuElements.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp index 14f4fbe6b1..85fc6ed634 100644 --- a/stepmania/src/HelpDisplay.cpp +++ b/stepmania/src/HelpDisplay.cpp @@ -14,11 +14,13 @@ HelpDisplay::HelpDisplay() m_fSecsUntilSwitch = 0; } -void HelpDisplay::Load() +void HelpDisplay::Load( const CString &sType ) { - RunCommands( THEME->GetMetricA(m_sName,"TipOnCommand") ); + TIP_SHOW_TIME.Load( sType, "TipShowTime" ); - LoadFromFont( THEME->GetPathF(m_sName,"text") ); + RunCommands( THEME->GetMetricA(sType,"TipOnCommand") ); + + LoadFromFont( THEME->GetPathF(sType,"text") ); m_fSecsUntilSwitch = TIP_SHOW_TIME; } @@ -31,8 +33,6 @@ void HelpDisplay::LoadFromNode( const CString& sDir, const XNode* pNode ) void HelpDisplay::SetName( const CString &sName, const CString &sID ) { BitmapText::SetName( sName, sID ); - - TIP_SHOW_TIME.Load( m_sName, "TipShowTime" ); } void HelpDisplay::SetTips( const CStringArray &arrayTips, const CStringArray &arrayTipsAlt ) diff --git a/stepmania/src/HelpDisplay.h b/stepmania/src/HelpDisplay.h index 773fd4c566..5531a59063 100644 --- a/stepmania/src/HelpDisplay.h +++ b/stepmania/src/HelpDisplay.h @@ -13,7 +13,7 @@ class HelpDisplay : public BitmapText { public: HelpDisplay(); - void Load(); + void Load( const CString &sType ); void LoadFromNode( const CString& sDir, const XNode* pNode ); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 58d9a83430..e031de1f56 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -220,7 +220,7 @@ void ScreenSelectMusic::Init() this->AddChild( &m_textTotalTime ); m_Artist.SetName( "ArtistDisplay" ); - m_Artist.Load(); + m_Artist.Load( "ArtistDisplay" ); SET_XY( m_Artist ); this->AddChild( &m_Artist ); diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index 0454275c2f..15f332d1c5 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -96,8 +96,8 @@ void ScreenWithMenuElements::Init() SET_XY_AND_ON_COMMAND( m_autoFooter ); this->AddChild( m_autoFooter ); - m_textHelp->SetName( "HelpDisplay", "Help" ); - m_textHelp->Load(); + m_textHelp->SetName( "Help" ); + m_textHelp->Load( "HelpDisplay" ); SET_XY_AND_ON_COMMAND( m_textHelp ); LoadHelpText(); this->AddChild( m_textHelp );