This commit is contained in:
Glenn Maynard
2006-08-17 02:49:54 +00:00
parent 162cdc13fa
commit fb655a8b32
+4 -14
View File
@@ -707,10 +707,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
return; return;
// a song was selected // a song was selected
switch( m_MusicWheel.GetSelectedType() ) if( m_MusicWheel.GetSelectedSong() != NULL )
{
case TYPE_SONG:
case TYPE_PORTAL:
{ {
const bool bIsNew = PROFILEMAN->IsSongNew( m_MusicWheel.GetSelectedSong() ); const bool bIsNew = PROFILEMAN->IsSongNew( m_MusicWheel.GetSelectedSong() );
bool bIsHard = false; bool bIsHard = false;
@@ -749,9 +746,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
if( GAMESTATE->IsCourseMode() ) if( GAMESTATE->IsCourseMode() )
GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR ); GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
} }
break; else if( m_MusicWheel.GetSelectedCourse() != NULL )
case TYPE_COURSE:
{ {
SOUND->PlayOnceFromAnnouncer( "select course comment general" ); SOUND->PlayOnceFromAnnouncer( "select course comment general" );
@@ -768,15 +763,10 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
m_bMadeChoice = true; m_bMadeChoice = true;
} }
break; else
case TYPE_SECTION: {
case TYPE_ROULETTE:
case TYPE_RANDOM:
case TYPE_SORT:
/* We havn't made a selection yet. */ /* We havn't made a selection yet. */
return; return;
default:
ASSERT(0);
} }
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();