We have a lot of duplicate, redundant checks between UNLOCKMAN->SongIsLocked
and Song::GetDisplayed/Song::NormallyDisplayed, which leads to inconsistency. Make UnlockManager::SongIsLocked() handle both. Returns a bitfield; most cases only need to test true or false. (Also adds m_bEnabled; not used yet.)
This commit is contained in:
@@ -39,7 +39,7 @@ static void GetAllSongsToShow( vector<Song*> &vpOut, bool bShowOnlyMostRecentSco
|
||||
vpOut.clear();
|
||||
FOREACH_CONST( Song*, SONGMAN->GetSongs(), s )
|
||||
{
|
||||
if( UNLOCKMAN->SongIsLocked(*s) )
|
||||
if( !(*s)->NormallyDisplayed() )
|
||||
continue; // skip
|
||||
if( !(*s)->ShowInDemonstrationAndRanking() )
|
||||
continue; // skip
|
||||
|
||||
Reference in New Issue
Block a user