broadcast m_SortOrder

stepmania/src/GameState.cpp

@@ -72,6 +72,7 @@ GameState::GameState() :
 	m_sPreferredCourseGroup(Message_PreferredCourseGroupChanged ),
 	m_PreferredCourseDifficulty( Message_PreferredCourseDifficultyP1Changed ),
 	m_PreferredDifficulty(	Message_PreferredDifficultyP1Changed ),
+	m_SortOrder(			Message_SortOrderChanged ),
     m_pCurSong(				Message_CurrentSongChanged ),
 	m_pCurSteps(			Message_CurrentStepsP1Changed ),
     m_pCurCourse(			Message_CurrentCourseChanged ),
@@ -189,7 +190,7 @@ void GameState::Reset()
 		m_PreferredDifficulty[p].Set( DIFFICULTY_INVALID );
 		m_PreferredCourseDifficulty[p].Set( DIFFICULTY_MEDIUM );
 	}
-	m_SortOrder = SORT_INVALID;
+	m_SortOrder.Set( SORT_INVALID );
 	m_PreferredSortOrder = GetDefaultSort();
 	m_PlayMode.Set( PLAY_MODE_INVALID );
 	m_EditMode = EDIT_MODE_INVALID;

stepmania/src/GameState.h

@@ -107,7 +107,7 @@ public:
 	BroadcastOnChange<CString>	m_sPreferredCourseGroup;	// GROUP_ALL denotes no preferred group
 	bool			m_bChangedFailTypeOnScreenSongOptions;	// true if FailType was changed in the song options screen
 	BroadcastOnChange1D<Difficulty,NUM_PLAYERS>	m_PreferredDifficulty;
-	SortOrder		m_SortOrder;			// set by MusicWheel
+	BroadcastOnChange<SortOrder> m_SortOrder;			// set by MusicWheel
 	SortOrder		m_PreferredSortOrder;			// used by MusicWheel
 	EditMode		m_EditMode;
 	bool			IsEditing() const { return m_EditMode != EDIT_MODE_INVALID; }

stepmania/src/MusicWheel.cpp

@@ -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.Set( new_so );
-
-	GAMESTATE->m_SortOrder = 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;
 

stepmania/src/ScreenNetSelectMusic.cpp

@@ -138,7 +138,7 @@ void ScreenNetSelectMusic::Input( const DeviceInput& DeviceI, const InputEventTy
 			so = SORT_TITLE;
 
 		GAMESTATE->m_PreferredSortOrder = so;
-		GAMESTATE->m_SortOrder = so;
+		GAMESTATE->m_SortOrder.Set( so );
 		m_MusicWheel.SelectSection( ssprintf("%c", c ) );
 		m_MusicWheel.SetOpenGroup( ssprintf("%c", c ), so );
 		m_MusicWheel.Move( +1 );