[MusicWheel, WheelBase] Added collapse sound.

This commit is contained in:
AJ Kelly
2012-03-01 21:35:33 -06:00
parent ce4366e605
commit 02ae959aab
5 changed files with 10 additions and 2 deletions
+1
View File
@@ -15,6 +15,7 @@ StepMania 5.0 alpha 2 | 20120???
set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ] set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ]
* [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ] * [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ]
* [ScreenSelectMusic] Added PlaySoundOnEnteringOptionsMenu metric. [AJ] * [ScreenSelectMusic] Added PlaySoundOnEnteringOptionsMenu metric. [AJ]
* [MusicWheel, WheelBase] Added collapse sound. [AJ]
StepMania 5.0 alpha 1a | 20120219 StepMania 5.0 alpha 1a | 20120219
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@@ -0,0 +1 @@
Common invalid
+1
View File
@@ -109,6 +109,7 @@ void MusicWheel::Load( RString sType )
m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") ); m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") );
m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true ); m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true );
m_soundCollapse.Load( THEME->GetPathS(sType,"collapse"), true );
// Update for SORT_MOST_PLAYED. // Update for SORT_MOST_PLAYED.
SONGMAN->UpdatePopular(); SONGMAN->UpdatePopular();
+5 -1
View File
@@ -283,12 +283,16 @@ bool WheelBase::Select() // return true if this selection can end the screen
{ {
RString sThisItemSectionName = m_CurWheelItemData[m_iSelection]->m_sText; RString sThisItemSectionName = m_CurWheelItemData[m_iSelection]->m_sText;
if( m_sExpandedSectionName == sThisItemSectionName ) // already expanded if( m_sExpandedSectionName == sThisItemSectionName ) // already expanded
{
SetOpenSection( "" ); // collapse it SetOpenSection( "" ); // collapse it
m_soundCollapse.Play();
}
else // already collapsed else // already collapsed
{
SetOpenSection( sThisItemSectionName ); // expand it SetOpenSection( sThisItemSectionName ); // expand it
m_soundExpand.Play(); m_soundExpand.Play();
} }
}
break; break;
default: default:
break; break;
+1
View File
@@ -99,6 +99,7 @@ protected:
RageSound m_soundChangeMusic; RageSound m_soundChangeMusic;
RageSound m_soundExpand; RageSound m_soundExpand;
RageSound m_soundCollapse;
RageSound m_soundLocked; RageSound m_soundLocked;
// bool WheelItemIsVisible(int n); // bool WheelItemIsVisible(int n);