don't play m_soundStart on timer

This commit is contained in:
Glenn Maynard
2004-01-12 23:18:38 +00:00
parent dc5cfb53a8
commit 2e9c78915c
2 changed files with 9 additions and 3 deletions
+8 -3
View File
@@ -1261,7 +1261,7 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
switch( SM ) switch( SM )
{ {
case SM_MenuTimer: case SM_MenuTimer:
MenuStart( PLAYER_INVALID ); EndScreen();
break; break;
case SM_GoToNextScreen: 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 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 ) void ScreenEvaluation::MenuStart( PlayerNumber pn )
{
m_soundStart.Play();
EndScreen();
}
void ScreenEvaluation::EndScreen()
{ {
TweenOffScreen(); TweenOffScreen();
@@ -1320,8 +1327,6 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn )
GAMESTATE->m_iRoundSeed = rand(); GAMESTATE->m_iRoundSeed = rand();
m_soundStart.Play();
if( PREFSMAN->m_bEventMode ) if( PREFSMAN->m_bEventMode )
{ {
m_Menu.StartTransitioning( SM_GoToNextScreen ); m_Menu.StartTransitioning( SM_GoToNextScreen );
+1
View File
@@ -59,6 +59,7 @@ public:
protected: protected:
void CommitScores( const StageStats &stageStats, int iPersonalHighScoreIndex[NUM_PLAYERS], int iMachineHighScoreIndex[NUM_PLAYERS], RankingCategory rc[NUM_PLAYERS] ); void CommitScores( const StageStats &stageStats, int iPersonalHighScoreIndex[NUM_PLAYERS], int iMachineHighScoreIndex[NUM_PLAYERS], RankingCategory rc[NUM_PLAYERS] );
void EndScreen();
CString m_sName; CString m_sName;
Type m_Type; Type m_Type;