From f1fddd90d1b660cd1439fbee7096451cd494e8e2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 12 Apr 2004 20:11:36 +0000 Subject: [PATCH] use SOUND->PlayOnceFromAnnouncer --- stepmania/src/ScreenGameplay.cpp | 23 +++++++++++------------ stepmania/src/ScreenSelectDifficulty.cpp | 2 +- stepmania/src/ScreenSelectGroup.cpp | 6 +++--- stepmania/src/ScreenTitleMenu.cpp | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index d1ba1f192a..03ef699108 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -18,7 +18,6 @@ #include "GameManager.h" #include "SongManager.h" #include "RageLog.h" -#include "AnnouncerManager.h" #include "LifeMeterBar.h" #include "LifeMeterBattery.h" #include "GameState.h" @@ -1152,7 +1151,7 @@ void ScreenGameplay::PlayAnnouncer( CString type, float fSeconds ) return; m_fTimeSinceLastDancingComment = 0; - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(type) ); + SOUND->PlayOnceFromAnnouncer( type ); if( m_pCombinedLifeMeter ) m_pCombinedLifeMeter->OnTaunt(); @@ -1171,7 +1170,7 @@ void ScreenGameplay::Update( float fDeltaTime ) if( m_bFirstUpdate ) { - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay intro") ); // crowd cheer + SOUND->PlayOnceFromAnnouncer( "gameplay intro" ); // crowd cheer // // Get the transitions rolling @@ -1909,17 +1908,17 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) { case SM_PlayReady: m_Background.FadeToActualBrightness(); - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay ready") ); + SOUND->PlayOnceFromAnnouncer( "gameplay ready" ); m_Ready.StartTransitioning( SM_PlayGo ); break; case SM_PlayGo: if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay here we go extra") ); + SOUND->PlayOnceFromAnnouncer( "gameplay here we go extra" ); else if( GAMESTATE->IsFinalStage() ) - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay here we go final") ); + SOUND->PlayOnceFromAnnouncer( "gameplay here we go final" ); else - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay here we go normal") ); + SOUND->PlayOnceFromAnnouncer( "gameplay here we go normal" ); m_Go.StartTransitioning( SM_None ); GAMESTATE->m_bPastHereWeGo = true; @@ -2031,7 +2030,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) { TweenOffScreen(); m_Extra.StartTransitioning( SM_GoToStateAfterCleared ); - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay extra") ); + SOUND->PlayOnceFromAnnouncer( "gameplay extra" ); } else { @@ -2059,7 +2058,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) break; } - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") ); + SOUND->PlayOnceFromAnnouncer( "gameplay cleared" ); } } @@ -2206,11 +2205,11 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) // Feels hackish. Feel free to make cleaner. if( GAMESTATE->IsCourseMode() ) if( GAMESTATE->GetCourseSongIndex() > (int(m_apSongsQueue.size() / 2) - 1 ) ) - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed halfway" ) ); + SOUND->PlayOnceFromAnnouncer( "gameplay oni failed halfway" ); else - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed" ) ); + SOUND->PlayOnceFromAnnouncer( "gameplay oni failed" ); else - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") ); + SOUND->PlayOnceFromAnnouncer( "gameplay failed" ); break; case SM_GoToScreenAfterFail: diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index b4180ce602..6acd4269b7 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -383,7 +383,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) static bool bPlaySelect = true; if( bPlaySelect ) { - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("ScreenSelectDifficulty comment %s",mc.m_sName.c_str())) ); + SOUND->PlayOnceFromAnnouncer( ssprintf("ScreenSelectDifficulty comment %s",mc.m_sName.c_str()) ); m_soundSelect.Play(); } diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 0deedb2ec6..9f38590f50 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -141,7 +141,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : Screen( sClassName m_soundChange.Load( THEME->GetPathToS("ScreenSelectGroup change") ); m_soundSelect.Load( THEME->GetPathToS("Common start") ); - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); + SOUND->PlayOnceFromAnnouncer( "select group intro" ); SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectGroup music") ); @@ -260,9 +260,9 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn ) GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() ); if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC ) - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") ); + SOUND->PlayOnceFromAnnouncer( "select group comment all music" ); else - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") ); + SOUND->PlayOnceFromAnnouncer( "select group comment general" ); TweenOffScreen(); diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 40e015f522..b08690ffea 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -169,7 +169,7 @@ ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassNam // this->AddChild( &m_BeginOut ); - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") ); + SOUND->PlayOnceFromAnnouncer( "title menu game name" ); m_soundChange.Load( THEME->GetPathToS("ScreenTitleMenu change"),true ); @@ -337,7 +337,7 @@ void ScreenTitleMenu::HandleScreenMessage( const ScreenMessage SM ) switch( SM ) { case SM_PlayComment: - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu attract") ); + SOUND->PlayOnceFromAnnouncer( "title menu attract" ); this->PostScreenMessage( SM_PlayComment, SECONDS_BETWEEN_COMMENTS ); break; case SM_GoToNextScreen: