don't play m_soundStart on timer

2004-01-12 23:18:38 +00:00
parent dc5cfb53a8
commit 2e9c78915c
2 changed files with 9 additions and 3 deletions
@@ -1261,7 +1261,7 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
 	switch( SM )
 	{
 	case SM_MenuTimer:
-		MenuStart( PLAYER_INVALID );
+		EndScreen();
 		break;
 	case SM_GoToNextScreen:
 		if(m_bFailed && !PREFSMAN->m_bEventMode && !(GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2()) && GAMESTATE->m_PlayMode == PLAY_MODE_ARCADE) // if failed and not in event mode go to gameover screen
@@ -1312,6 +1312,13 @@ void ScreenEvaluation::MenuBack( PlayerNumber pn )
 }

 void ScreenEvaluation::MenuStart( PlayerNumber pn )
+{
+	m_soundStart.Play();
+
+	EndScreen();
+}
+
+void ScreenEvaluation::EndScreen()
 {
 	TweenOffScreen();

@@ -1320,8 +1327,6 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn )

 	GAMESTATE->m_iRoundSeed = rand();

-	m_soundStart.Play();
-
 	if( PREFSMAN->m_bEventMode )
 	{
 		m_Menu.StartTransitioning( SM_GoToNextScreen );