From 457f92f06abc4a3d725f2b5f3d0394c9efe0cba5 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 4 Dec 2004 21:16:00 +0000 Subject: [PATCH] make start sound overridable --- stepmania/src/ScreenSelectMaster.cpp | 5 +++-- stepmania/src/ScreenSelectMaster.h | 10 +--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index f11ab982e5..d79a405966 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -194,8 +194,9 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl m_bChosen[p] = false; } - m_soundChange.Load( THEME->GetPathToS( ssprintf("%s change", m_sName.c_str())), true ); + m_soundChange.Load( THEME->GetPathToS( ssprintf("%s change", m_sName.c_str())) ); m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") ); + m_soundStart.Load( THEME->GetPathToS( ssprintf("%s start", m_sName.c_str())) ); // init m_Next order info for( int dir = 0; dir < NUM_DIRS; ++dir ) @@ -596,7 +597,7 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn ) GameCommand &mc = m_aGameCommands[m_iChoice[pn]]; SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), mc.m_sName.c_str())) ); - SCREENMAN->PlayStartSound(); + m_soundStart.Play(); float fSecs = 0; bool bAllDone = true; diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h index 8cc96d8791..db81fd5487 100644 --- a/stepmania/src/ScreenSelectMaster.h +++ b/stepmania/src/ScreenSelectMaster.h @@ -71,6 +71,7 @@ protected: RageSound m_soundChange; RandomSample m_soundDifficult; + RageSound m_soundStart; int m_iChoice[NUM_PLAYERS]; bool m_bChosen[NUM_PLAYERS]; @@ -78,15 +79,6 @@ protected: float m_fLockInputSecs; }; -// -// Aliases -// -class ScreenSelectStyle5th : public ScreenSelectMaster -{ -public: - ScreenSelectStyle5th( CString sName ): ScreenSelectMaster( sName ) { } -}; - #endif