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

broadcast m_SortOrder

Browse Source
This commit is contained in:
Glenn Maynard
2005-08-24 20:42:14 +00:00
parent 833903e7ef
commit 56817d9490
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+5 -7
View File
@@ -142,13 +142,13 @@ void MusicWheel::Load( CString sType )
GAMESTATE->m_SongOptions = so;
}
GAMESTATE->m_SortOrder = GAMESTATE->m_PreferredSortOrder;
GAMESTATE->m_SortOrder.Set( GAMESTATE->m_PreferredSortOrder );
/* Never start in the mode menu; some elements may not initialize correctly. */
if( GAMESTATE->m_SortOrder == SORT_MODE_MENU )
GAMESTATE->m_SortOrder = SORT_INVALID;
GAMESTATE->m_SortOrder.Set( SORT_INVALID );
GAMESTATE->m_SortOrder = ForceAppropriateSort( GAMESTATE->m_PlayMode, GAMESTATE->m_SortOrder );
GAMESTATE->m_SortOrder.Set( ForceAppropriateSort(GAMESTATE->m_PlayMode, GAMESTATE->m_SortOrder) );
/* Only save the sort order if the player didn't already have one. If he did, don't
* overwrite it. */
@@ -1039,9 +1039,7 @@ bool MusicWheel::ChangeSort( SortOrder new_so ) // return true if change success
/* Save the new preference. */
if( IsSongSort(new_so) )
GAMESTATE->m_PreferredSortOrder = new_so;
GAMESTATE->m_SortOrder = new_so;
GAMESTATE->m_SortOrder = new_so;
GAMESTATE->m_SortOrder.Set( new_so );
m_WheelState = STATE_FLYING_OFF_BEFORE_NEXT_SORT;
return true;
@@ -1184,7 +1182,7 @@ void MusicWheel::StartRandom()
void MusicWheel::SetOpenGroup(CString group, SortOrder so)
{
if( so != SORT_INVALID )
GAMESTATE->m_SortOrder = so;
GAMESTATE->m_SortOrder.Set( so );
m_sExpandedSectionName = group;