From f694fe5955556b09d6eb7677548a34ea3128f844 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 13 May 2011 08:50:59 -0400 Subject: [PATCH] [splittiming] Add sounds to recent actions. --- Themes/_fallback/Sounds/ScreenEdit switch player.redir | 1 + Themes/_fallback/Sounds/ScreenEdit switch timing.redir | 1 + src/ScreenEdit.cpp | 4 ++++ src/ScreenEdit.h | 8 ++++++++ 4 files changed, 14 insertions(+) create mode 100644 Themes/_fallback/Sounds/ScreenEdit switch player.redir create mode 100644 Themes/_fallback/Sounds/ScreenEdit switch timing.redir diff --git a/Themes/_fallback/Sounds/ScreenEdit switch player.redir b/Themes/_fallback/Sounds/ScreenEdit switch player.redir new file mode 100644 index 0000000000..cd59d419fb --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenEdit switch player.redir @@ -0,0 +1 @@ +MusicWheel sort diff --git a/Themes/_fallback/Sounds/ScreenEdit switch timing.redir b/Themes/_fallback/Sounds/ScreenEdit switch timing.redir new file mode 100644 index 0000000000..cd59d419fb --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenEdit switch timing.redir @@ -0,0 +1 @@ +MusicWheel sort diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 94a2bb44f1..35760b7872 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -837,6 +837,8 @@ void ScreenEdit::Init() m_soundMarker.Load( THEME->GetPathS("ScreenEdit","marker"), true ); m_soundValueIncrease.Load( THEME->GetPathS("ScreenEdit","value increase"), true ); m_soundValueDecrease.Load( THEME->GetPathS("ScreenEdit","value decrease"), true ); + m_soundSwitchPlayer.Load( THEME->GetPathS("ScreenEdit","switch player"), true ); + m_soundSwitchTiming.Load( THEME->GetPathS("ScreenEdit","switch timing"), true ); m_soundSwitchSteps.Load( THEME->GetPathS("ScreenEdit","switch steps") ); m_soundSave.Load( THEME->GetPathS("ScreenEdit","save") ); m_GameplayAssist.Init(); @@ -2124,11 +2126,13 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) enum_add( m_InputPlayerNumber, 1 ); if( m_InputPlayerNumber == NUM_PLAYERS ) m_InputPlayerNumber = PLAYER_1; + m_soundSwitchPlayer.Play(); } break; case EDIT_BUTTON_SWITCH_TIMINGS: GAMESTATE->m_bIsEditorStepTiming = !GAMESTATE->m_bIsEditorStepTiming; + m_soundSwitchTiming.Play(); break; } } diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h index da134f6aa2..d6a472e5c3 100644 --- a/src/ScreenEdit.h +++ b/src/ScreenEdit.h @@ -281,14 +281,22 @@ protected: /** @brief Has the NoteData been changed such that a user should be prompted to save? */ bool m_bDirty; + /** @brief The sound that is played when a note is added. */ RageSound m_soundAddNote; + /** @brief The sound that is played when a note is removed. */ RageSound m_soundRemoveNote; RageSound m_soundChangeLine; RageSound m_soundChangeSnap; RageSound m_soundMarker; RageSound m_soundValueIncrease; RageSound m_soundValueDecrease; + /** @brief The sound that is played when switching players for Routine. */ + RageSound m_soundSwitchPlayer; + /** @brief The sound that is played when switching song/step timing. */ + RageSound m_soundSwitchTiming; + /** @brief The sound that is played when switching to a different chart. */ RageSound m_soundSwitchSteps; + /** @brief The sound that is played when the chart is saved. */ RageSound m_soundSave; // used for reverting