From 7ed30954925fef4fa28913fd6a5a909d022cc82e Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 6 Oct 2013 23:03:50 -0500 Subject: [PATCH] Allow per-screen Start sounds instead of forcing Common Start (Sourced from shakesoda/stepmania.) --- Docs/Changelog_sm5.txt | 5 +++++ Themes/_fallback/Sounds/ScreenOptions start.redir | 1 + src/ScreenOptions.cpp | 5 +++-- src/ScreenOptions.h | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Themes/_fallback/Sounds/ScreenOptions start.redir diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index b8a477ef0e..484a8ce12c 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,11 @@ ________________________________________________________________________________ StepMania current development -------------------------------------------------------------------------------- +2013/10/06 +---------- +* [ScreenOptions] Allow for the use of per-screen Start sounds instead of a forced + Common Start. [SSC] + 2013/10/03 ---------- * [GameConstantsAndTypes] Declared RankingCategory as a type. [SSC] diff --git a/Themes/_fallback/Sounds/ScreenOptions start.redir b/Themes/_fallback/Sounds/ScreenOptions start.redir new file mode 100644 index 0000000000..3d35ae28c0 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenOptions start.redir @@ -0,0 +1 @@ +Common start \ No newline at end of file diff --git a/src/ScreenOptions.cpp b/src/ScreenOptions.cpp index eb59b039d5..e32b21b7dc 100644 --- a/src/ScreenOptions.cpp +++ b/src/ScreenOptions.cpp @@ -120,6 +120,7 @@ void ScreenOptions::Init() m_SoundPrevRow.Load( THEME->GetPathS(m_sName,"prev"), true ); m_SoundToggleOn.Load( THEME->GetPathS(m_sName,"toggle on"), true ); m_SoundToggleOff.Load( THEME->GetPathS(m_sName,"toggle off"), true ); + m_SoundStart.Load( THEME->GetPathS(m_sName,"start"), true ); // add everything to m_frameContainer so we can animate everything at once m_frameContainer.SetName( "Container" ); @@ -830,7 +831,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input ) if( iCurRow < 0 ) { // this shouldn't be happening, but it is, so we need to bail out. -aj - SCREENMAN->PlayStartSound(); + m_SoundStart.PlayCopy(); this->BeginFadingOut(); return; } @@ -874,7 +875,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input ) if( bEndThisScreen ) { - SCREENMAN->PlayStartSound(); + m_SoundStart.PlayCopy(); this->BeginFadingOut(); return; } diff --git a/src/ScreenOptions.h b/src/ScreenOptions.h index d419103c79..0fe23143f1 100644 --- a/src/ScreenOptions.h +++ b/src/ScreenOptions.h @@ -142,6 +142,7 @@ protected: // derived classes need access to these RageSound m_SoundPrevRow; RageSound m_SoundToggleOn; RageSound m_SoundToggleOff; + RageSound m_SoundStart; // metrics ThemeMetric NUM_ROWS_SHOWN;