This commit is contained in:
Glenn Maynard
2006-08-17 02:50:21 +00:00
parent fb655a8b32
commit 035b4d9fd6
+2 -4
View File
@@ -739,8 +739,6 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
else else
SOUND->PlayOnceFromAnnouncer( "select music comment general" ); SOUND->PlayOnceFromAnnouncer( "select music comment general" );
m_bMadeChoice = true;
/* If we're in event mode, we may have just played a course (putting us /* If we're in event mode, we may have just played a course (putting us
* in course mode). Make sure we're in a single song mode. */ * in course mode). Make sure we're in a single song mode. */
if( GAMESTATE->IsCourseMode() ) if( GAMESTATE->IsCourseMode() )
@@ -760,8 +758,6 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
SO_GROUP_ASSIGN( GAMESTATE->m_SongOptions, ModsLevel_Stage, m_LifeType, SongOptions::LIFE_BATTERY ); SO_GROUP_ASSIGN( GAMESTATE->m_SongOptions, ModsLevel_Stage, m_LifeType, SongOptions::LIFE_BATTERY );
SO_GROUP_ASSIGN( GAMESTATE->m_SongOptions, ModsLevel_Stage, m_iBatteryLives, pCourse->m_iLives ); SO_GROUP_ASSIGN( GAMESTATE->m_SongOptions, ModsLevel_Stage, m_iBatteryLives, pCourse->m_iLives );
} }
m_bMadeChoice = true;
} }
else else
{ {
@@ -769,6 +765,8 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
return; return;
} }
m_bMadeChoice = true;
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
if( OPTIONS_MENU_AVAILABLE ) if( OPTIONS_MENU_AVAILABLE )