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

fixes

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-29 22:02:52 +00:00
parent e273da39c6
commit 7c64310add
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+9 -4
View File
@@ -190,6 +190,11 @@ void MusicWheel::Load()
m_SortOrder = ForceAppropriateSort( GAMESTATE->m_PlayMode, m_SortOrder ); m_SortOrder = ForceAppropriateSort( GAMESTATE->m_PlayMode, m_SortOrder );
/* Only save the sort order if the player didn't already have one. If he did, don't
* overwrite it. */
if( GAMESTATE->m_PreferredSortOrder == SORT_INVALID )
GAMESTATE->m_PreferredSortOrder = m_SortOrder;
/* Update for SORT_MOST_PLAYED. */ /* Update for SORT_MOST_PLAYED. */
SONGMAN->UpdateBest(); SONGMAN->UpdateBest();
@@ -973,7 +978,7 @@ void MusicWheel::Update( float fDeltaTime )
} }
// //
// Change difficulty for sorts by meter - XXX: with GameCommand? // Change difficulty for sorts by meter - XXX: do this with GameCommand?
// //
Difficulty dc = DIFFICULTY_INVALID; Difficulty dc = DIFFICULTY_INVALID;
switch( m_SortOrder ) switch( m_SortOrder )
@@ -1311,8 +1316,8 @@ void MusicWheel::StartRandom()
void MusicWheel::SetOpenGroup(CString group, SortOrder so) void MusicWheel::SetOpenGroup(CString group, SortOrder so)
{ {
if( so == SORT_INVALID) if( so != SORT_INVALID )
so = m_SortOrder; m_SortOrder = so;
m_sExpandedSectionName = group; m_sExpandedSectionName = group;
@@ -1321,7 +1326,7 @@ void MusicWheel::SetOpenGroup(CString group, SortOrder so)
old = m_CurWheelItemData[m_iSelection]; old = m_CurWheelItemData[m_iSelection];
m_CurWheelItemData.clear(); m_CurWheelItemData.clear();
vector<WheelItemData> &from = m_WheelItemDatas[so]; vector<WheelItemData> &from = m_WheelItemDatas[m_SortOrder];
for( unsigned i = 0; i < from.size(); ++i ) for( unsigned i = 0; i < from.size(); ++i )
{ {
WheelItemData &d = from[i]; WheelItemData &d = from[i];