use Song::GetDisplayed

This commit is contained in:
Glenn Maynard
2007-08-13 19:18:55 +00:00
parent 8fb359e053
commit a1d33f8588
4 changed files with 7 additions and 7 deletions
+3 -3
View File
@@ -253,7 +253,7 @@ int Profile::GetTotalStepsWithTopGrade( StepsType st, Difficulty d, Grade g ) co
FOREACH_CONST( Song*, SONGMAN->GetSongs(), pSong ) FOREACH_CONST( Song*, SONGMAN->GetSongs(), pSong )
{ {
if( (*pSong)->m_SelectionDisplay == Song::SHOW_NEVER ) if( (*pSong)->GetDisplayed() == Song::SHOW_NEVER )
continue; // skip continue; // skip
FOREACH_CONST( Steps*, (*pSong)->GetAllSteps(), pSteps ) FOREACH_CONST( Steps*, (*pSong)->GetAllSteps(), pSteps )
@@ -315,7 +315,7 @@ float Profile::GetSongsPossible( StepsType st, Difficulty dc ) const
{ {
Song* pSong = vSongs[i]; Song* pSong = vSongs[i];
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER ) if( pSong->GetDisplayed() == Song::SHOW_NEVER )
continue; // skip continue; // skip
vector<Steps*> vSteps = pSong->GetAllSteps(); vector<Steps*> vSteps = pSong->GetAllSteps();
@@ -355,7 +355,7 @@ float Profile::GetSongsActual( StepsType st, Difficulty dc ) const
if( pSong == NULL ) if( pSong == NULL )
continue; continue;
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER ) if( pSong->GetDisplayed() == Song::SHOW_NEVER )
continue; // skip continue; // skip
CHECKPOINT_M( ssprintf("Profile::GetSongsActual: song %s", pSong->GetSongDir().c_str()) ); CHECKPOINT_M( ssprintf("Profile::GetSongsActual: song %s", pSong->GetSongDir().c_str()) );
+1 -1
View File
@@ -596,7 +596,7 @@ int SongManager::GetNumSelectableAndUnlockedSongs() const
{ {
if( UNLOCKMAN->SongIsLocked( *i ) ) if( UNLOCKMAN->SongIsLocked( *i ) )
continue; continue;
if( (*i)->m_SelectionDisplay != Song::SHOW_ALWAYS ) if( (*i)->GetDisplayed() != Song::SHOW_ALWAYS )
continue; continue;
num++; num++;
} }
+2 -2
View File
@@ -34,11 +34,11 @@ bool SongCriteria::Matches( const Song *pSong ) const
{ {
DEFAULT_FAIL(m_Selectable); DEFAULT_FAIL(m_Selectable);
case Selectable_Yes: case Selectable_Yes:
if( pSong->m_SelectionDisplay != Song::SHOW_ALWAYS ) if( pSong->GetDisplayed() != Song::SHOW_ALWAYS )
return false; return false;
break; break;
case Selectable_No: case Selectable_No:
if( pSong->m_SelectionDisplay != Song::SHOW_NEVER ) if( pSong->GetDisplayed() != Song::SHOW_NEVER )
return false; return false;
break; break;
case Selectable_DontCare: case Selectable_DontCare:
+1 -1
View File
@@ -283,7 +283,7 @@ bool StageStats::PlayerHasHighScore( PlayerNumber pn ) const
// If this is a SHOW_NEVER song, then it's probably a training. // If this is a SHOW_NEVER song, then it's probably a training.
// Don't show a high score // Don't show a high score
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER ) if( pSong->GetDisplayed() == Song::SHOW_NEVER )
return false; return false;
const HighScoreList &hsl = const HighScoreList &hsl =