From a14d760e0cf94eaf933e2761ef05bc5331a522bd Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 13 Apr 2011 03:41:09 -0500 Subject: [PATCH] [ScreenSelectMusic] Made score frame into an AutoActor, changed the filename from "score frame p1" to "ScoreFrame P1" for consistency with other elements. --- Docs/Changelog_sm-ssc.txt | 5 +++++ src/ScreenSelectMusic.cpp | 8 ++++---- src/ScreenSelectMusic.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index fa37556d03..eee6838a0c 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -16,6 +16,11 @@ It depends on who you ask. It could be v1.2.5, it could be v1.3.0, it could even be StepMania 5. We will wait and see. +20110413 +-------- +* [ScreenSelectMusic] Made score frame into an AutoActor, changed the filename + from "score frame p1" to "ScoreFrame P1" for consistency with other elements. [AJ] + 20110405 -------- * [ScreenEdit] Allow modifying the #DISPLAYBPM traits in the editor. Look in diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 14cb6bf61c..422487438c 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -199,10 +199,10 @@ void ScreenSelectMusic::Init() FOREACH_ENUM( PlayerNumber, p ) { - m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) ); - m_sprHighScoreFrame[p].Load( THEME->GetPathG(m_sName,ssprintf("score frame p%d",p+1)) ); + m_sprHighScoreFrame[p].Load( THEME->GetPathG(m_sName,ssprintf("ScoreFrame P%d",p+1)) ); + m_sprHighScoreFrame[p]->SetName( ssprintf("ScoreFrameP%d",p+1) ); LOAD_ALL_COMMANDS_AND_SET_XY( m_sprHighScoreFrame[p] ); - this->AddChild( &m_sprHighScoreFrame[p] ); + this->AddChild( m_sprHighScoreFrame[p] ); m_textHighScore[p].SetName( ssprintf("ScoreP%d",p+1) ); m_textHighScore[p].LoadFromFont( THEME->GetPathF(m_sName,"score") ); @@ -247,7 +247,7 @@ void ScreenSelectMusic::BeginScreen() { if( GAMESTATE->IsHumanPlayer(pn) ) continue; - m_sprHighScoreFrame[pn].SetVisible( false ); + m_sprHighScoreFrame[pn]->SetVisible( false ); m_textHighScore[pn].SetVisible( false ); } diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h index 6e75a65b34..1531aa80c8 100644 --- a/src/ScreenSelectMusic.h +++ b/src/ScreenSelectMusic.h @@ -123,7 +123,7 @@ protected: FadingBanner m_Banner; Sprite m_sprCDTitleFront, m_sprCDTitleBack; - Sprite m_sprHighScoreFrame[NUM_PLAYERS]; + AutoActor m_sprHighScoreFrame[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS]; MusicWheel m_MusicWheel; OptionsList m_OptionsList[NUM_PLAYERS];