Allow per-screen Start sounds instead of forcing Common Start

(Sourced from shakesoda/stepmania.)
This commit is contained in:
AJ Kelly
2013-10-06 23:03:50 -05:00
parent f91be6cf9f
commit 7ed3095492
4 changed files with 10 additions and 2 deletions
+5
View File
@@ -8,6 +8,11 @@ ________________________________________________________________________________
StepMania current development 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 2013/10/03
---------- ----------
* [GameConstantsAndTypes] Declared RankingCategory as a type. [SSC] * [GameConstantsAndTypes] Declared RankingCategory as a type. [SSC]
@@ -0,0 +1 @@
Common start
+3 -2
View File
@@ -120,6 +120,7 @@ void ScreenOptions::Init()
m_SoundPrevRow.Load( THEME->GetPathS(m_sName,"prev"), true ); m_SoundPrevRow.Load( THEME->GetPathS(m_sName,"prev"), true );
m_SoundToggleOn.Load( THEME->GetPathS(m_sName,"toggle on"), true ); m_SoundToggleOn.Load( THEME->GetPathS(m_sName,"toggle on"), true );
m_SoundToggleOff.Load( THEME->GetPathS(m_sName,"toggle off"), 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 // add everything to m_frameContainer so we can animate everything at once
m_frameContainer.SetName( "Container" ); m_frameContainer.SetName( "Container" );
@@ -830,7 +831,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
if( iCurRow < 0 ) if( iCurRow < 0 )
{ {
// this shouldn't be happening, but it is, so we need to bail out. -aj // this shouldn't be happening, but it is, so we need to bail out. -aj
SCREENMAN->PlayStartSound(); m_SoundStart.PlayCopy();
this->BeginFadingOut(); this->BeginFadingOut();
return; return;
} }
@@ -874,7 +875,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
if( bEndThisScreen ) if( bEndThisScreen )
{ {
SCREENMAN->PlayStartSound(); m_SoundStart.PlayCopy();
this->BeginFadingOut(); this->BeginFadingOut();
return; return;
} }
+1
View File
@@ -142,6 +142,7 @@ protected: // derived classes need access to these
RageSound m_SoundPrevRow; RageSound m_SoundPrevRow;
RageSound m_SoundToggleOn; RageSound m_SoundToggleOn;
RageSound m_SoundToggleOff; RageSound m_SoundToggleOff;
RageSound m_SoundStart;
// metrics // metrics
ThemeMetric<int> NUM_ROWS_SHOWN; ThemeMetric<int> NUM_ROWS_SHOWN;