diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp index 0a343f5e75..227e3ed38a 100644 --- a/stepmania/src/MenuElements.cpp +++ b/stepmania/src/MenuElements.cpp @@ -20,6 +20,7 @@ #include "GameState.h" #include "ThemeManager.h" #include "MenuTimer.h" +#include "HelpDisplay.h" #define TIMER_SECONDS THEME->GetMetricI(m_sName,"TimerSeconds") @@ -29,11 +30,13 @@ MenuElements::MenuElements() { m_MenuTimer = new MenuTimer; + m_textHelp = new HelpDisplay; } MenuElements::~MenuElements() { delete m_MenuTimer; + delete m_textHelp; } void MenuElements::Load( CString sClassName ) @@ -79,12 +82,12 @@ void MenuElements::Load( CString sClassName ) UtilOnCommand( m_autoFooter, "MenuElements" ); this->AddChild( m_autoFooter ); - m_textHelp.SetName( "Help" ); + m_textHelp->SetName( "Help" ); UtilOnCommand( m_textHelp, "MenuElements" ); CStringArray asHelpTips; split( THEME->GetMetric(m_sName,"HelpText"), "\n", asHelpTips ); - m_textHelp.SetTips( asHelpTips ); - this->AddChild( &m_textHelp ); + m_textHelp->SetTips( asHelpTips ); + this->AddChild( m_textHelp ); m_In.Load( THEME->GetPathToB(m_sName+" in") ); @@ -163,7 +166,7 @@ void MenuElements::DrawTopLayer() if( m_bTimerEnabled ) m_MenuTimer->Draw(); m_autoFooter->Draw(); - m_textHelp.Draw(); + m_textHelp->Draw(); m_In.Draw(); m_Out.Draw(); m_Back.Draw(); diff --git a/stepmania/src/MenuElements.h b/stepmania/src/MenuElements.h index be4e8b4c8f..fffb2a12c6 100644 --- a/stepmania/src/MenuElements.h +++ b/stepmania/src/MenuElements.h @@ -15,12 +15,12 @@ #include "Screen.h" #include "Sprite.h" #include "Transition.h" -#include "HelpDisplay.h" #include "BGAnimation.h" #include "ActorUtil.h" #include "RageSound.h" class MenuTimer; +class HelpDisplay; class MenuElements : public ActorFrame { public: @@ -49,7 +49,7 @@ public: // let owner tinker with these objects Sprite m_sprStyleIcon; MenuTimer *m_MenuTimer; AutoActor m_autoFooter; - HelpDisplay m_textHelp; + HelpDisplay *m_textHelp; Transition m_In; Transition m_Out;