From 10614a067b1e1f8875c73d8c8df81c2d75192aaa Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Sat, 2 Apr 2005 17:27:44 +0000 Subject: [PATCH] Fix: Don't let song wheel go flying when you enter options. Fix: Update high grades on song wheel based on difficulty. --- stepmania/src/ScreenNetSelectMusic.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 18421aaae7..d804da245e 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -28,6 +28,7 @@ AutoScreenMessage( SM_SMOnlinePack ) AutoScreenMessage( SM_SetWheelSong ) AutoScreenMessage( SM_RefreshWheelLocation ) AutoScreenMessage( SM_SongChanged ) +AutoScreenMessage( SM_UsersUpdate ) const CString AllGroups = "[ALL MUSIC]"; @@ -157,6 +158,10 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM ) SOUND->StopMusic(); SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "NextScreen") ); } + else if( SM == SM_UsersUpdate ) + { + m_MusicWheel.Move( 0 ); + } else if( SM == SM_NoSongs ) { SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "NoSongsScreen") ); @@ -484,10 +489,15 @@ void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn ) StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; + Steps * pSteps = GAMESTATE->m_pCurSong->GetStepsByDifficulty( st, m_DC[pn] ); + GAMESTATE->m_pCurSteps[pn].Set( pSteps ); + if ( ( m_DC[pn] < NUM_DIFFICULTIES ) && ( m_DC[pn] >= DIFFICULTY_BEGINNER ) ) - m_DifficultyMeters[pn].SetFromSteps( GAMESTATE->m_pCurSong->GetStepsByDifficulty( st, m_DC[pn] ) ); + m_DifficultyMeters[pn].SetFromSteps( pSteps ); else m_DifficultyMeters[pn].SetFromMeterAndDifficulty( 0, DIFFICULTY_BEGINNER ); + + m_MusicWheel.NotesOrTrailChanged( pn ); } void ScreenNetSelectMusic::MusicChanged()