actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-17 01:19:34 +00:00
parent 2fe1e69522
commit 5328536c22
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+9 -17
View File
@@ -597,11 +597,6 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
// the user explicity switched difficulties. Update the preferred difficulty // the user explicity switched difficulties. Update the preferred difficulty
GAMESTATE->ChangePreferredDifficulty( pn, m_vpSteps[ m_iSelection[pn] ]->GetDifficulty() ); GAMESTATE->ChangePreferredDifficulty( pn, m_vpSteps[ m_iSelection[pn] ]->GetDifficulty() );
if( dir < 0 )
m_soundDifficultyEasier.Play();
else
m_soundDifficultyHarder.Play();
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
@@ -624,11 +619,6 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
// the user explicity switched difficulties. Update the preferred difficulty // the user explicity switched difficulties. Update the preferred difficulty
GAMESTATE->ChangePreferredCourseDifficulty( pn, m_vpTrails[ m_iSelection[pn] ]->m_CourseDifficulty ); GAMESTATE->ChangePreferredCourseDifficulty( pn, m_vpTrails[ m_iSelection[pn] ]->m_CourseDifficulty );
if( dir < 0 )
m_soundDifficultyEasier.Play();
else
m_soundDifficultyHarder.Play();
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
@@ -648,12 +638,9 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
/* XXX: We could be on a music or course sort, or even one with both; we don't /* XXX: We could be on a music or course sort, or even one with both; we don't
* really know which difficulty to change. Maybe the two difficulties should be * really know which difficulty to change. Maybe the two difficulties should be
* linked ... */ * linked ... */
if( GAMESTATE->ChangePreferredDifficulty( pn, dir ) )
{ {
if( dir < 0 ) if( !GAMESTATE->ChangePreferredDifficulty( pn, dir ) )
m_soundDifficultyEasier.Play(); return;
else
m_soundDifficultyHarder.Play();
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
@@ -665,14 +652,19 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
} }
} }
AfterStepsChange( vpns ); AfterStepsChange( vpns );
break;
} }
break;
case TYPE_SORT: case TYPE_SORT:
break; return;
default: default:
WARN( ssprintf("%i", m_MusicWheel.GetSelectedType()) ); WARN( ssprintf("%i", m_MusicWheel.GetSelectedType()) );
break; break;
} }
if( dir < 0 )
m_soundDifficultyEasier.Play();
else
m_soundDifficultyHarder.Play();
} }