We have two ways of only showing songs in roulette: unlocks and

"#SELECTABLE".

I'm not sure if this feature is worth keeping, but there definitely doesn't
need to be two ways to do it.  Remove #SELECTABLE:ROULETTE.
This commit is contained in:
Glenn Maynard
2007-04-10 23:08:07 +00:00
parent 3c9f9c1d9e
commit a9d8d0f405
+1 -4
View File
@@ -347,13 +347,10 @@ void MusicWheel::GetSongList( vector<Song*> &arraySongs, SortOrder so, const RSt
(!GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2()) )
{
/* Hide songs that asked to be hidden via #SELECTABLE. */
if( so!=SORT_ROULETTE && !pSong->NormallyDisplayed() )
if( !pSong->NormallyDisplayed() )
continue;
if( so!=SORT_ROULETTE && UNLOCKMAN->SongIsRouletteOnly( pSong ) )
continue;
/* Don't show in roulette if #SELECTABLE:NO. */
if( so==SORT_ROULETTE && !pSong->RouletteDisplayed() )
continue;
}
/* Hide locked songs. If RANDOM_PICKS_LOCKED_SONGS, hide in Roulette and Random,