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

don't pass parent; m_pParent is used, which is set by AddChild

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-15 19:16:39 +00:00
parent d2a4a2fa76
commit 29eb1f6ccb
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuTimer.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void MenuTimer::Update( float fDeltaTime )
if( iCrossed <= WARNING_START )
{
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
m_text[i].RunCommands( WARNING_COMMAND.GetValue(iCrossed), this );
m_text[i].RunCommands( WARNING_COMMAND.GetValue(iCrossed) );
}
if( iCrossed <= WARNING_BEEP_START && m_soundBeep.IsLoaded() )
stepmania/src/PaneDisplay.cpp
+6 -6
View File
@@ -74,17 +74,17 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
if( g_Contents[p].type == NUM_PANES )
continue; /* skip, disabled */
m_ContentsFrame.AddChild( &m_textContents[p] );
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, 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();
}
stepmania/src/TextBanner.cpp
+6 -6
View File
@@ -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 );
}
}