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

SwitchToPreferredDifficulty -> SwitchToPreferredSongDifficulty

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-01 19:19:35 +00:00
parent 373744a64a
commit cab74820c4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+6 -6
View File
@@ -949,6 +949,9 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
case TYPE_RANDOM: case TYPE_RANDOM:
case TYPE_ROULETTE: case TYPE_ROULETTE:
case TYPE_LEAP: case TYPE_LEAP:
/* 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->ChangeDifficulty( pn, dir ) ) if( GAMESTATE->ChangeDifficulty( pn, dir ) )
{ {
if( dir < 0 ) if( dir < 0 )
@@ -1228,13 +1231,10 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn )
m_PaneDisplay[pn].SetFromGameState(); m_PaneDisplay[pn].SetFromGameState();
} }
void ScreenSelectMusic::SwitchToPreferredDifficulty() void ScreenSelectMusic::SwitchToPreferredSongDifficulty()
{ {
FOREACH_PlayerNumber( p ) FOREACH_HumanPlayer( p )
{ {
if( !GAMESTATE->IsHumanPlayer( PlayerNumber(p) ) )
continue;
/* Find the closest match to the user's preferred difficulty. */ /* Find the closest match to the user's preferred difficulty. */
int CurDifference = -1; int CurDifference = -1;
for( unsigned i=0; i<m_arrayNotes.size(); i++ ) for( unsigned i=0; i<m_arrayNotes.size(); i++ )
@@ -1404,7 +1404,7 @@ void ScreenSelectMusic::AfterMusicChange()
m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyleDef()->m_StepsType ); m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyleDef()->m_StepsType );
SwitchToPreferredDifficulty(); SwitchToPreferredSongDifficulty();
/* Short delay before actually showing these, so they don't show /* Short delay before actually showing these, so they don't show
* up when scrolling fast. It'll still show up in "slow" scrolling, * up when scrolling fast. It'll still show up in "slow" scrolling,
stepmania/src/ScreenSelectMusic.h
+1 -1
View File
@@ -61,7 +61,7 @@ protected:
void ChangeDifficulty( PlayerNumber pn, int dir ); void ChangeDifficulty( PlayerNumber pn, int dir );
void AfterNotesChange( PlayerNumber pn ); void AfterNotesChange( PlayerNumber pn );
void SwitchToPreferredDifficulty(); void SwitchToPreferredSongDifficulty();
void AfterMusicChange(); void AfterMusicChange();
void SortOrderChanged(); void SortOrderChanged();