From 2e174881c51d15fa9cd6c1c441ef7db06c70fb53 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 1 May 2004 23:30:30 +0000 Subject: [PATCH] don't load multiple copies of "common back" sound --- stepmania/src/ScreenCaution.cpp | 2 +- stepmania/src/ScreenCenterImage.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index 8de20e6e01..9374579676 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -99,6 +99,6 @@ void ScreenCaution::MenuBack( PlayerNumber pn ) return; this->ClearMessageQueue(); m_Back.StartTransitioning( SM_GoToPrevScreen ); - SOUND->PlayOnce( THEME->GetPathToS("Common back") ); + SCREENMAN->PlayBackSound(); } diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp index 71a8b8af7d..5152085de7 100644 --- a/stepmania/src/ScreenCenterImage.cpp +++ b/stepmania/src/ScreenCenterImage.cpp @@ -126,7 +126,7 @@ void ScreenCenterImage::Input( const DeviceInput& DeviceI, const InputEventType case SDLK_ESCAPE: if(!IsTransitioning()) { - SOUND->PlayOnce( THEME->GetPathToS("Common back") ); + SCREENMAN->PlayBackSound(); StartTransitioning( SM_GoToPrevScreen ); } case SDLK_RETURN: diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 464a5697de..8989ffa4b1 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1626,7 +1626,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ LOG->Trace("Player %i went back", MenuI.player+1); m_DancingState = STATE_OUTRO; - SOUND->PlayOnce( THEME->GetPathToS("Common back") ); + SCREENMAN->PlayBackSound(); /* Hmm. There are a bunch of subtly different ways we can * tween out: * 1. Keep rendering the song, and keep it moving. This might