From bdbeb958e93d71b9f770010ade6d8cf9560dc9b2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 20 Apr 2004 04:58:34 +0000 Subject: [PATCH] SOUND->PlayOnceFromAnnouncer --- stepmania/src/ScreenSelectMusic.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 99b9b21135..e84afcef2c 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -21,11 +21,8 @@ #include "PrefsManager.h" #include "RageLog.h" #include "InputMapper.h" -#include "AnnouncerManager.h" -#include "InputMapper.h" #include "GameState.h" #include "CodeDetector.h" -#include "GameConstantsAndTypes.h" #include "ThemeManager.h" #include "Steps.h" #include "ActorUtil.h" @@ -333,7 +330,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName m_soundOptionsChange.Load( THEME->GetPathToS("ScreenSelectMusic options") ); m_soundLocked.Load( THEME->GetPathToS("ScreenSelectMusic locked") ); - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") ); + SOUND->PlayOnceFromAnnouncer( "select music intro" ); m_bMadeChoice = false; m_bGoToOptions = false; @@ -1065,13 +1062,13 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) bIsRepeat = false; if( bIsRepeat ) - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment repeat") ); + SOUND->PlayOnceFromAnnouncer( "select music comment repeat" ); else if( bIsNew ) - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") ); + SOUND->PlayOnceFromAnnouncer( "select music comment new" ); else if( bIsHard ) - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); + SOUND->PlayOnceFromAnnouncer( "select music comment hard" ); else - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment general") ); + SOUND->PlayOnceFromAnnouncer( "select music comment general" ); m_bMadeChoice = true; @@ -1084,7 +1081,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) } case TYPE_COURSE: { - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") ); + SOUND->PlayOnceFromAnnouncer( "select course comment general" ); Course *pCourse = m_MusicWheel.GetSelectedCourse(); ASSERT( pCourse );