From d7d678fcb40afe8b81b1625e84c228b6125edf48 Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Sat, 29 Jun 2002 09:57:57 +0000 Subject: [PATCH] Default Announcer Bugfix --- stepmania/src/ScreenTitleMenu.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 07af10aad6..9645259249 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -126,6 +126,11 @@ ScreenTitleMenu::ScreenTitleMenu() m_Fade.OpenWipingRight( SM_DoneOpening ); this->AddActor( &m_Fade ); + /* ENSURE that the correct announcer is in place for GAME_DANCE (the default game) */ + if (GAME_DANCE == GAMEMAN->m_CurGame) + { + ANNOUNCER->SwitchAnnouncer( "default" ); + } SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_TITLE_MENU_GAME_NAME) ); @@ -169,7 +174,9 @@ void ScreenTitleMenu::HandleScreenMessage( const ScreenMessage SM ) { case SM_DoneOpening: if( PREFSMAN->m_bAnnouncer ) + { m_soundTitle.PlayRandom(); + } break; case SM_PlayAttract: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_TITLE_MENU_ATTRACT) ); @@ -268,8 +275,8 @@ void ScreenTitleMenu::MenuStart( const PlayerNumber p ) return; case CHOICE_SELECT_GAME: m_soundInvalid.PlayRandom(); - //m_soundSelect.PlayRandom(); - //m_Fade.CloseWipingRight( SM_GoToSelectGame ); + // m_soundSelect.PlayRandom(); + // m_Fade.CloseWipingRight( SM_GoToSelectGame ); return; case CHOICE_MAP_INSTRUMENTS: m_soundSelect.PlayRandom();