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 @@ void ScreenSelectGroup::Init()
|
||||
{
|
||||
bool DisplaySong = aAllSongs[j]->NormallyDisplayed();
|
||||
|
||||
if( UNLOCKMAN->SongIsLocked( aAllSongs[j] ) )
|
||||
if( !aAllSongs[j]->NormallyDisplayed() )
|
||||
DisplaySong = false;
|
||||
|
||||
if( aAllSongs[j]->SongCompleteForStyle(GAMESTATE->GetCurrentStyle()) &&
|
||||
|
||||
Reference in New Issue
Block a user