Explicitly set the preferred song in SSM's ctor, instead of handling it in
the music wheel. This way, we can re-set the preferred song at any time and have it take effect when we get back to the wheel; previously, if we'd already played a song, m_pCurSong would override it.
This commit is contained in:
@@ -258,12 +258,8 @@ bool MusicWheel::SelectSongOrCourse()
|
||||
{
|
||||
if( GAMESTATE->m_pCurSong && SelectSong( GAMESTATE->m_pCurSong ) )
|
||||
return true;
|
||||
if( GAMESTATE->m_pPreferredSong && SelectSong( GAMESTATE->m_pPreferredSong ) )
|
||||
return true;
|
||||
if( GAMESTATE->m_pCurCourse && SelectCourse( GAMESTATE->m_pCurCourse ) )
|
||||
return true;
|
||||
if( GAMESTATE->m_pPreferredCourse && SelectCourse( GAMESTATE->m_pPreferredCourse ) )
|
||||
return true;
|
||||
|
||||
// Select the first selectable song based on the sort order...
|
||||
vector<WheelItemData> &wiWheelItems = m_WheelItemDatas[m_SortOrder];
|
||||
|
||||
Reference in New Issue
Block a user