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

allow changing difficulty while on sorts

Browse Source 
simplify
This commit is contained in:
Glenn Maynard
2006-08-17 01:42:06 +00:00
parent 8c74e5998d
commit affad434af
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+7 -21
View File
@@ -585,42 +585,28 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
ASSERT( GAMESTATE->IsHumanPlayer(pn) ); ASSERT( GAMESTATE->IsHumanPlayer(pn) );
switch( m_MusicWheel.GetSelectedType() ) if( GAMESTATE->m_pCurSong )
{ {
case TYPE_SONG:
case TYPE_PORTAL:
m_iSelection[pn] += dir; m_iSelection[pn] += dir;
if( CLAMP(m_iSelection[pn],0,m_vpSteps.size()-1) ) if( CLAMP(m_iSelection[pn],0,m_vpSteps.size()-1) )
return; return;
// 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() );
break; }
else if( GAMESTATE->m_pCurCourse )
case TYPE_COURSE: {
m_iSelection[pn] += dir; m_iSelection[pn] += dir;
if( CLAMP(m_iSelection[pn],0,m_vpTrails.size()-1) ) if( CLAMP(m_iSelection[pn],0,m_vpTrails.size()-1) )
return; return;
// 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 );
break; }
else
case TYPE_RANDOM: {
case TYPE_ROULETTE:
case TYPE_SECTION:
/* 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
* linked ... */
if( !GAMESTATE->ChangePreferredDifficulty( pn, dir ) ) if( !GAMESTATE->ChangePreferredDifficulty( pn, dir ) )
return; return;
break;
case TYPE_SORT:
return;
default:
WARN( ssprintf("%i", m_MusicWheel.GetSelectedType()) );
break;
} }
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;