From a9d8d0f40545d8cd7a442260b6d62c1e3e3b8d06 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 10 Apr 2007 23:08:07 +0000 Subject: [PATCH] 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. --- stepmania/src/MusicWheel.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 57f923ac12..504defb7fe 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -347,13 +347,10 @@ void MusicWheel::GetSongList( vector &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,