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:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user