play sounds normally

This commit is contained in:
Glenn Maynard
2006-11-21 17:57:06 +00:00
parent a4e69a7ec7
commit 6276a1f93d
2 changed files with 9 additions and 4 deletions
+6 -4
View File
@@ -3,7 +3,6 @@
#include "ScreenManager.h" #include "ScreenManager.h"
#include "RageLog.h" #include "RageLog.h"
#include "InputMapper.h" #include "InputMapper.h"
#include "GameSoundManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "DateTime.h" #include "DateTime.h"
#include "EnumHelper.h" #include "EnumHelper.h"
@@ -69,6 +68,9 @@ void ScreenSetTime::Init()
value.SetDiffuse( RageColor(1,1,1,1) ); value.SetDiffuse( RageColor(1,1,1,1) );
} }
m_soundChangeSelection.Load( THEME->GetPathS("ScreenSetTime","ChangeSelection") );
m_soundChangeValue.Load( THEME->GetPathS("ScreenSetTime","ChangeValue") );
m_TimeOffset = 0; m_TimeOffset = 0;
m_Selection = (SetTimeSelection)0; m_Selection = (SetTimeSelection)0;
ChangeSelection( 0 ); ChangeSelection( 0 );
@@ -133,7 +135,7 @@ void ScreenSetTime::ChangeValue( int iDirection )
m_TimeOffset = iAdjusted - iNow; m_TimeOffset = iAdjusted - iNow;
SOUND->PlayOnce( THEME->GetPathS("ScreenSetTime","ChangeValue") ); m_soundChangeValue.Play();
} }
void ScreenSetTime::ChangeSelection( int iDirection ) void ScreenSetTime::ChangeSelection( int iDirection )
@@ -152,7 +154,7 @@ void ScreenSetTime::ChangeSelection( int iDirection )
RageColor(1,1,1,1) ); RageColor(1,1,1,1) );
if( iDirection != 0 ) if( iDirection != 0 )
SOUND->PlayOnce( THEME->GetPathS("ScreenSetTime","ChangeSelection") ); m_soundChangeSelection.Play();
} }
void ScreenSetTime::MenuUp( const InputEventPlus &input ) void ScreenSetTime::MenuUp( const InputEventPlus &input )
@@ -209,7 +211,7 @@ void ScreenSetTime::MenuStart( const InputEventPlus &input )
value.SetDiffuse( RageColor(1,1,1,0) ); value.SetDiffuse( RageColor(1,1,1,0) );
} }
SOUND->PlayOnce( THEME->GetPathS("Common","start") ); SCREENMAN->PlayStartSound();
StartTransitioningScreen( SM_GoToNextScreen ); StartTransitioningScreen( SM_GoToNextScreen );
} }
else else
+3
View File
@@ -3,6 +3,7 @@
#include "ScreenWithMenuElements.h" #include "ScreenWithMenuElements.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "RageSound.h"
enum SetTimeSelection enum SetTimeSelection
{ {
@@ -38,6 +39,8 @@ private:
void ChangeSelection( int iDirection ); void ChangeSelection( int iDirection );
void ChangeValue( int iDirection ); void ChangeValue( int iDirection );
RageSound m_soundChangeValue;
RageSound m_soundChangeSelection;
BitmapText m_textTitle[NUM_SetTimeSelection]; BitmapText m_textTitle[NUM_SetTimeSelection];
BitmapText m_textValue[NUM_SetTimeSelection]; BitmapText m_textValue[NUM_SetTimeSelection];
BitmapText m_textDayOfWeek; BitmapText m_textDayOfWeek;