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

always update m_sprStage, simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-25 18:25:43 +00:00
parent 35d264b2e8
commit ad2ee106b9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+4 -4
View File
@@ -159,8 +159,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
} }
} }
// loaded in AfterMusicChange
m_sprStage.SetName( "Stage" ); m_sprStage.SetName( "Stage" );
m_sprStage.Load( THEME->GetPathToG("ScreenSelectMusic stage "+GAMESTATE->GetStageText()) );
SET_XY( m_sprStage ); SET_XY( m_sprStage );
this->AddChild( &m_sprStage ); this->AddChild( &m_sprStage );
@@ -1178,9 +1178,6 @@ void ScreenSelectMusic::AfterMusicChange()
OFF_COMMAND( m_sprBalloon ); 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_Artists.push_back( pSong->GetDisplayArtist() );
m_AltArtists.push_back( pSong->GetTranslitArtist() ); m_AltArtists.push_back( pSong->GetTranslitArtist() );
} }
@@ -1260,6 +1257,9 @@ void ScreenSelectMusic::AfterMusicChange()
ASSERT(0); 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. // Don't stop music if it's already playing the right file.
if( SampleMusicToPlay == "" ) if( SampleMusicToPlay == "" )
SOUND->StopMusic(); SOUND->StopMusic();