From ad2ee106b9dbccb2f6d97113a4404ef6e6d8a23c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 25 Nov 2003 18:25:43 +0000 Subject: [PATCH] always update m_sprStage, simplify --- stepmania/src/ScreenSelectMusic.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 41be815757..7590e7a0a1 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -159,8 +159,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName } } + // loaded in AfterMusicChange m_sprStage.SetName( "Stage" ); - m_sprStage.Load( THEME->GetPathToG("ScreenSelectMusic stage "+GAMESTATE->GetStageText()) ); SET_XY( m_sprStage ); this->AddChild( &m_sprStage ); @@ -1178,9 +1178,6 @@ void ScreenSelectMusic::AfterMusicChange() OFF_COMMAND( m_sprBalloon ); } - // update stage counter display (long versions/marathons) - m_sprStage.Load( THEME->GetPathToG("ScreenSelectMusic stage "+GAMESTATE->GetStageText()) ); - m_Artists.push_back( pSong->GetDisplayArtist() ); m_AltArtists.push_back( pSong->GetTranslitArtist() ); } @@ -1260,6 +1257,9 @@ void ScreenSelectMusic::AfterMusicChange() ASSERT(0); } + // update stage counter display (long versions/marathons) + m_sprStage.Load( THEME->GetPathToG("ScreenSelectMusic stage "+GAMESTATE->GetStageText()) ); + // Don't stop music if it's already playing the right file. if( SampleMusicToPlay == "" ) SOUND->StopMusic();