From b3eaa7a1adaeea6b7cc72a1a566f3f9b3d9e1c48 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 21 Aug 2006 21:49:11 +0000 Subject: [PATCH] avoid global ThemeMetric (note: we won't have a dozen copies of these functions in memory; we make one and copy it, so we'll just make Lua references) --- stepmania/src/MusicWheelItem.cpp | 36 ++++++++++++++------------------ 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index 4986d3434c..0f19f4b4c5 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -18,18 +18,6 @@ static RString GRADE_X_NAME( size_t p ) { return ssprintf("GradeP%dX",int(p+1)); } static RString GRADE_Y_NAME( size_t p ) { return ssprintf("GradeP%dY",int(p+1)); } -static ThemeMetric ICON_X ("MusicWheelItem","IconX"); -static ThemeMetric ICON_Y ("MusicWheelItem","IconY"); -static ThemeMetric ICON_ON_COMMAND ("MusicWheelItem","IconOnCommand"); -static ThemeMetric SONG_NAME_X ("MusicWheelItem","SongNameX"); -static ThemeMetric SONG_NAME_Y ("MusicWheelItem","SongNameY"); -static ThemeMetric SONG_NAME_ON_COMMAND ("MusicWheelItem","SongNameOnCommand"); -static ThemeMetric SECTION_X ("MusicWheelItem","SectionX"); -static ThemeMetric SECTION_Y ("MusicWheelItem","SectionY"); -static ThemeMetric SECTION_ON_COMMAND ("MusicWheelItem","SectionOnCommand"); -static ThemeMetric ROULETTE_X ("MusicWheelItem","RouletteX"); -static ThemeMetric ROULETTE_Y ("MusicWheelItem","RouletteY"); -static ThemeMetric ROULETTE_ON_COMMAND ("MusicWheelItem","RouletteOnCommand"); static ThemeMetric1D GRADE_X ("MusicWheelItem",GRADE_X_NAME,NUM_PLAYERS); static ThemeMetric1D GRADE_Y ("MusicWheelItem",GRADE_Y_NAME,NUM_PLAYERS); @@ -62,26 +50,34 @@ MusicWheelItem::MusicWheelItem( RString sType ): m_sprSortBar.Load( THEME->GetPathG(sType,"sort") ); this->AddChild( &m_sprSortBar ); - m_WheelNotifyIcon.SetXY( ICON_X, ICON_Y ); - m_WheelNotifyIcon.RunCommands( ICON_ON_COMMAND ); + m_WheelNotifyIcon.SetName( "Icon" ); + ActorUtil::LoadAllCommands( m_WheelNotifyIcon, "MusicWheelItem" ); + ActorUtil::SetXY( m_WheelNotifyIcon, "MusicWheelItem" ); + m_WheelNotifyIcon.PlayCommand( "On" ); this->AddChild( &m_WheelNotifyIcon ); + m_TextBanner.SetName( "SongName" ); + ActorUtil::LoadAllCommands( m_TextBanner, "MusicWheelItem" ); m_TextBanner.Load( "TextBanner" ); - m_TextBanner.SetXY( SONG_NAME_X, SONG_NAME_Y ); - m_TextBanner.RunCommands( SONG_NAME_ON_COMMAND ); + ActorUtil::SetXY( m_WheelNotifyIcon, "MusicWheelItem" ); + m_TextBanner.PlayCommand( "On" ); this->AddChild( &m_TextBanner ); + m_textSection.SetName( "Section" ); + ActorUtil::LoadAllCommands( m_textSection, "MusicWheelItem" ); m_textSection.LoadFromFont( THEME->GetPathF(sType,"section") ); + ActorUtil::SetXY( m_textSection, "MusicWheelItem" ); m_textSection.SetShadowLength( 0 ); - m_textSection.SetXY( SECTION_X, SECTION_Y ); - m_textSection.RunCommands( SECTION_ON_COMMAND ); + m_textSection.PlayCommand( "On" ); this->AddChild( &m_textSection ); + m_textRoulette.SetName( "Roulette" ); + ActorUtil::LoadAllCommands( m_textRoulette, "MusicWheelItem" ); m_textRoulette.LoadFromFont( THEME->GetPathF(sType,"roulette") ); + ActorUtil::SetXY( m_textRoulette, "MusicWheelItem" ); m_textRoulette.SetShadowLength( 0 ); m_textRoulette.TurnRainbowOn(); - m_textRoulette.SetXY( ROULETTE_X, ROULETTE_Y ); - m_textRoulette.RunCommands( ROULETTE_ON_COMMAND ); + m_textRoulette.PlayCommand( "On" ); this->AddChild( &m_textRoulette ); m_textCourse.SetName( "CourseName" );