From 162cdc13fa0c0ada0721b3656b3d9589296159ea Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 17 Aug 2006 02:47:35 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenSelectMusic.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 01e51d3bcc..f3f6d7f39e 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -637,7 +637,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM ) } else if( DO_ROULETTE_ON_MENU_TIMER ) { - if( m_MusicWheel.GetSelectedType() != TYPE_SONG ) + if( m_MusicWheel.GetSelectedSong() == NULL && m_MusicWheel.GetSelectedCourse() == NULL ) { m_MusicWheel.StartRoulette(); m_MenuTimer->SetSeconds( 15 ); @@ -653,17 +653,9 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM ) // Finish sort changing so that the wheel can respond immediately to our // request to choose random. m_MusicWheel.FinishChangingSorts(); - switch( m_MusicWheel.GetSelectedType() ) - { - case TYPE_SONG: - case TYPE_COURSE: - case TYPE_RANDOM: - case TYPE_PORTAL: - break; - default: + if( m_MusicWheel.GetSelectedSong() == NULL && m_MusicWheel.GetSelectedCourse() == NULL ) m_MusicWheel.StartRandom(); - break; - } + MenuStart(PLAYER_INVALID); } return;