This commit is contained in:
Glenn Maynard
2002-09-07 09:37:27 +00:00
parent eff3563208
commit d4f750d6b3
+4 -9
View File
@@ -596,14 +596,13 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
/* why do this? breaks tabs and roulette -glenn */ /* why do this? breaks tabs and roulette -glenn */
// if( pn != PLAYER_INVALID ) // if( pn != PLAYER_INVALID )
// this->SendScreenMessage( SM_MenuTimer, 1 ); // re-throw a timer message // this->SendScreenMessage( SM_MenuTimer, 1 ); // re-throw a timer message
return;
} }
else // if !bResult
{
// a song was selected // a song was selected
switch( m_MusicWheel.GetSelectedType() ) switch( m_MusicWheel.GetSelectedType() )
{ {
case TYPE_SONG: case TYPE_SONG: {
{
if( !m_MusicWheel.GetSelectedSong()->HasMusic() ) if( !m_MusicWheel.GetSelectedSong()->HasMusic() )
{ {
/* TODO: gray these out. /* TODO: gray these out.
@@ -655,19 +654,15 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
m_Menu.StopTimer(); m_Menu.StopTimer();
this->SendScreenMessage( SM_GoToNextScreen, 2.5f ); this->SendScreenMessage( SM_GoToNextScreen, 2.5f );
}
break; break;
}
case TYPE_SECTION: case TYPE_SECTION:
break; break;
case TYPE_ROULETTE: case TYPE_ROULETTE:
break; break;
} }
} }
}
void ScreenSelectMusic::MenuBack( PlayerNumber pn ) void ScreenSelectMusic::MenuBack( PlayerNumber pn )
{ {