use Song::GetDisplayed
This commit is contained in:
@@ -253,7 +253,7 @@ int Profile::GetTotalStepsWithTopGrade( StepsType st, Difficulty d, Grade g ) co
|
||||
|
||||
FOREACH_CONST( Song*, SONGMAN->GetSongs(), pSong )
|
||||
{
|
||||
if( (*pSong)->m_SelectionDisplay == Song::SHOW_NEVER )
|
||||
if( (*pSong)->GetDisplayed() == Song::SHOW_NEVER )
|
||||
continue; // skip
|
||||
|
||||
FOREACH_CONST( Steps*, (*pSong)->GetAllSteps(), pSteps )
|
||||
@@ -315,7 +315,7 @@ float Profile::GetSongsPossible( StepsType st, Difficulty dc ) const
|
||||
{
|
||||
Song* pSong = vSongs[i];
|
||||
|
||||
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
|
||||
if( pSong->GetDisplayed() == Song::SHOW_NEVER )
|
||||
continue; // skip
|
||||
|
||||
vector<Steps*> vSteps = pSong->GetAllSteps();
|
||||
@@ -355,7 +355,7 @@ float Profile::GetSongsActual( StepsType st, Difficulty dc ) const
|
||||
if( pSong == NULL )
|
||||
continue;
|
||||
|
||||
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
|
||||
if( pSong->GetDisplayed() == Song::SHOW_NEVER )
|
||||
continue; // skip
|
||||
|
||||
CHECKPOINT_M( ssprintf("Profile::GetSongsActual: song %s", pSong->GetSongDir().c_str()) );
|
||||
|
||||
@@ -596,7 +596,7 @@ int SongManager::GetNumSelectableAndUnlockedSongs() const
|
||||
{
|
||||
if( UNLOCKMAN->SongIsLocked( *i ) )
|
||||
continue;
|
||||
if( (*i)->m_SelectionDisplay != Song::SHOW_ALWAYS )
|
||||
if( (*i)->GetDisplayed() != Song::SHOW_ALWAYS )
|
||||
continue;
|
||||
num++;
|
||||
}
|
||||
|
||||
@@ -34,11 +34,11 @@ bool SongCriteria::Matches( const Song *pSong ) const
|
||||
{
|
||||
DEFAULT_FAIL(m_Selectable);
|
||||
case Selectable_Yes:
|
||||
if( pSong->m_SelectionDisplay != Song::SHOW_ALWAYS )
|
||||
if( pSong->GetDisplayed() != Song::SHOW_ALWAYS )
|
||||
return false;
|
||||
break;
|
||||
case Selectable_No:
|
||||
if( pSong->m_SelectionDisplay != Song::SHOW_NEVER )
|
||||
if( pSong->GetDisplayed() != Song::SHOW_NEVER )
|
||||
return false;
|
||||
break;
|
||||
case Selectable_DontCare:
|
||||
|
||||
@@ -283,7 +283,7 @@ bool StageStats::PlayerHasHighScore( PlayerNumber pn ) const
|
||||
|
||||
// If this is a SHOW_NEVER song, then it's probably a training.
|
||||
// Don't show a high score
|
||||
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
|
||||
if( pSong->GetDisplayed() == Song::SHOW_NEVER )
|
||||
return false;
|
||||
|
||||
const HighScoreList &hsl =
|
||||
|
||||
Reference in New Issue
Block a user