diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp index 4ab2180507..235046f064 100644 --- a/stepmania/src/MenuTimer.cpp +++ b/stepmania/src/MenuTimer.cpp @@ -91,7 +91,7 @@ void MenuTimer::Update( float fDeltaTime ) if( iCrossed <= WARNING_START ) { for( int i=0; iGetPathF(sMetricsGroup,"text") ); m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) ); ActorUtil::LoadAllCommands( m_textContents[p], sMetricsGroup ); - ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup, this ); - m_ContentsFrame.AddChild( &m_textContents[p] ); + ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup ); + m_ContentsFrame.AddChild( m_Labels[p] ); m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") ); m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) ); ActorUtil::LoadAllCommands( *m_Labels[p], sMetricsGroup ); - ActorUtil::SetXYAndOnCommand( m_Labels[p], sMetricsGroup, this ); - m_ContentsFrame.AddChild( m_Labels[p] ); + ActorUtil::SetXYAndOnCommand( m_Labels[p], sMetricsGroup ); ActorUtil::LoadAllCommandsFromName( m_textContents[p], sMetricsGroup, g_Contents[p].name ); } @@ -94,8 +94,8 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn ) for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i ) { - m_textContents[i].PlayCommand( "LoseFocus", this ); - m_Labels[i]->PlayCommand( "LoseFocus", this ); + m_textContents[i].PlayCommand( "LoseFocus" ); + m_Labels[i]->PlayCommand( "LoseFocus" ); m_textContents[i].FinishTweening(); m_Labels[i]->FinishTweening(); } diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp index b61e931486..0027fe8ef5 100644 --- a/stepmania/src/TextBanner.cpp +++ b/stepmania/src/TextBanner.cpp @@ -78,15 +78,15 @@ void TextBanner::LoadFromString( if( bTwoLines ) { - m_textTitle.RunCommands( TWO_LINES_TITLE_COMMAND, this ); - m_textSubTitle.RunCommands( TWO_LINES_SUBTITLE_COMMAND, this ); - m_textArtist.RunCommands( TWO_LINES_ARTIST_COMMAND, this ); + m_textTitle.RunCommands( TWO_LINES_TITLE_COMMAND ); + m_textSubTitle.RunCommands( TWO_LINES_SUBTITLE_COMMAND ); + m_textArtist.RunCommands( TWO_LINES_ARTIST_COMMAND ); } else { - m_textTitle.RunCommands( THREE_LINES_TITLE_COMMAND, this ); - m_textSubTitle.RunCommands( THREE_LINES_SUBTITLE_COMMAND, this ); - m_textArtist.RunCommands( THREE_LINES_ARTIST_COMMAND, this ); + m_textTitle.RunCommands( THREE_LINES_TITLE_COMMAND ); + m_textSubTitle.RunCommands( THREE_LINES_SUBTITLE_COMMAND ); + m_textArtist.RunCommands( THREE_LINES_ARTIST_COMMAND ); } }