From be95c365160774467a25b19332d16604a21874b0 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 12 Feb 2007 23:16:00 +0000 Subject: [PATCH] fix double-loading of commands ActorUtil::SetXY calls ActorUtil::LoadAllCommands, which doesn't seem right. This should be cleaned up someday. --- stepmania/src/PaneDisplay.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp index 6865d0bbef..a32ed31f16 100644 --- a/stepmania/src/PaneDisplay.cpp +++ b/stepmania/src/PaneDisplay.cpp @@ -75,14 +75,12 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn ) m_textContents[p].LoadFromFont( THEME->GetPathF(sMetricsGroup,"text") ); m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) ); - ActorUtil::LoadAllCommands( m_textContents[p], sMetricsGroup ); - ActorUtil::SetXYAndOnCommand( m_textContents[p], sMetricsGroup ); + ActorUtil::SetXY( m_textContents[p], sMetricsGroup ); // SetXY loads all commands m_ContentsFrame.AddChild( &m_textContents[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 ); + ActorUtil::SetXY( m_Labels[p], sMetricsGroup ); // SetXY loads all commands m_ContentsFrame.AddChild( m_Labels[p] ); ActorUtil::LoadAllCommandsFromName( m_textContents[p], sMetricsGroup, g_Contents[p].name );