diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 8cfd8c6401..c4e34a237b 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -15,6 +15,7 @@ StepMania 5.0 alpha 2 | 20120??? set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ] * [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ] * [ScreenSelectMusic] Added PlaySoundOnEnteringOptionsMenu metric. [AJ] +* [MusicWheel, WheelBase] Added collapse sound. [AJ] StepMania 5.0 alpha 1a | 20120219 -------------------------------------------------------------------------------- diff --git a/Themes/_fallback/Sounds/MusicWheel collapse.redir b/Themes/_fallback/Sounds/MusicWheel collapse.redir new file mode 100644 index 0000000000..5272adb660 --- /dev/null +++ b/Themes/_fallback/Sounds/MusicWheel collapse.redir @@ -0,0 +1 @@ +Common invalid \ No newline at end of file diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 5b6af3280b..7adce9de96 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -109,6 +109,7 @@ void MusicWheel::Load( RString sType ) m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") ); m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true ); + m_soundCollapse.Load( THEME->GetPathS(sType,"collapse"), true ); // Update for SORT_MOST_PLAYED. SONGMAN->UpdatePopular(); diff --git a/src/WheelBase.cpp b/src/WheelBase.cpp index 797f422153..25753a1f45 100644 --- a/src/WheelBase.cpp +++ b/src/WheelBase.cpp @@ -283,11 +283,15 @@ bool WheelBase::Select() // return true if this selection can end the screen { RString sThisItemSectionName = m_CurWheelItemData[m_iSelection]->m_sText; if( m_sExpandedSectionName == sThisItemSectionName ) // already expanded + { SetOpenSection( "" ); // collapse it + m_soundCollapse.Play(); + } else // already collapsed + { SetOpenSection( sThisItemSectionName ); // expand it - - m_soundExpand.Play(); + m_soundExpand.Play(); + } } break; default: diff --git a/src/WheelBase.h b/src/WheelBase.h index 0a99704dc1..dbbb786385 100644 --- a/src/WheelBase.h +++ b/src/WheelBase.h @@ -99,6 +99,7 @@ protected: RageSound m_soundChangeMusic; RageSound m_soundExpand; + RageSound m_soundCollapse; RageSound m_soundLocked; // bool WheelItemIsVisible(int n);