Revert this, and do it differently: prefer the preferred song/course in

MusicWheel::SelectSongOrCourse instead of the active one.  The advantage
of this is that if, for example, a PreferredCourse is set, the player is playing
regular play (not course mode), and then switches to course mode via the
mode menu, the course will be selected correctly.  (Previously, it'd end up
on the default course in that case instead.)
This commit is contained in:
Glenn Maynard
2005-02-25 00:29:09 +00:00
parent 5376cf473b
commit 0e59f3d135
2 changed files with 5 additions and 10 deletions
+5 -1
View File
@@ -251,13 +251,17 @@ MusicWheel::~MusicWheel()
{
}
/* If a song or course is set in GAMESTATE and avaialble, select it. Otherwise, choose the
/* If a song or course is set in GAMESTATE and available, select it. Otherwise, choose the
* first available song or course. Return true if an item was set, false if no items are
* available. */
bool MusicWheel::SelectSongOrCourse()
{
if( GAMESTATE->m_pPreferredSong && SelectSong( GAMESTATE->m_pPreferredSong ) )
return true;
if( GAMESTATE->m_pCurSong && SelectSong( GAMESTATE->m_pCurSong ) )
return true;
if( GAMESTATE->m_pPreferredCourse && SelectCourse( GAMESTATE->m_pPreferredCourse ) )
return true;
if( GAMESTATE->m_pCurCourse && SelectCourse( GAMESTATE->m_pCurCourse ) )
return true;