actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Do not use SONGMAN inside SongManager member functions. This one actually was using it inside const functions.

Browse Source
This commit is contained in:
Steve Checkoway
2007-05-05 11:12:34 +00:00
parent 0aa7e6e5e2
commit f9dbb386d7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+7 -7
View File
@@ -307,7 +307,7 @@ void SongManager::PreloadSongImages()
* that we don't need to. */ * that we don't need to. */
RageTexturePreloader preload; RageTexturePreloader preload;
const vector<Song*> &songs = SONGMAN->GetSongs(); const vector<Song*> &songs = GetSongs();
for( unsigned i = 0; i < songs.size(); ++i ) for( unsigned i = 0; i < songs.size(); ++i )
{ {
if( !songs[i]->HasBanner() ) if( !songs[i]->HasBanner() )
@@ -318,7 +318,7 @@ void SongManager::PreloadSongImages()
} }
vector<Course*> courses; vector<Course*> courses;
SONGMAN->GetAllCourses( courses, false ); GetAllCourses( courses, false );
for( unsigned i = 0; i < courses.size(); ++i ) for( unsigned i = 0; i < courses.size(); ++i )
{ {
if( !courses[i]->HasBanner() ) if( !courses[i]->HasBanner() )
@@ -608,7 +608,7 @@ int SongManager::GetNumAdditionalSongs() const
int num = 0; int num = 0;
FOREACH_CONST( Song*, m_pSongs, i ) FOREACH_CONST( Song*, m_pSongs, i )
{ {
if( SONGMAN->WasLoadedFromAdditionalSongs( *i ) ) if( WasLoadedFromAdditionalSongs( *i ) )
num++; num++;
} }
return num; return num;
@@ -629,7 +629,7 @@ int SongManager::GetNumAdditionalCourses() const
int num = 0; int num = 0;
FOREACH_CONST( Course*, m_pCourses, i ) FOREACH_CONST( Course*, m_pCourses, i )
{ {
if( SONGMAN->WasLoadedFromAdditionalCourses( *i ) ) if( WasLoadedFromAdditionalCourses( *i ) )
num++; num++;
} }
return num; return num;
@@ -904,7 +904,7 @@ void SongManager::SetPreferences()
void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot slot ) const void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot slot ) const
{ {
const vector<Song*> &vSongs = SONGMAN->GetSongs(); const vector<Song*> &vSongs = GetSongs();
FOREACH_CONST( Song*, vSongs, song ) FOREACH_CONST( Song*, vSongs, song )
{ {
(*song)->GetStepsLoadedFromProfile( slot, AddTo ); (*song)->GetStepsLoadedFromProfile( slot, AddTo );
@@ -914,7 +914,7 @@ void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot
Song *SongManager::GetSongFromSteps( Steps *pSteps ) const Song *SongManager::GetSongFromSteps( Steps *pSteps ) const
{ {
ASSERT( pSteps ); ASSERT( pSteps );
const vector<Song*> &vSongs = SONGMAN->GetSongs(); const vector<Song*> &vSongs = GetSongs();
FOREACH_CONST( Song*, vSongs, song ) FOREACH_CONST( Song*, vSongs, song )
{ {
vector<Steps*> vSteps; vector<Steps*> vSteps;
@@ -1026,7 +1026,7 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, Song*& pSong
{ {
/* This normally shouldn't happen, but it's helpful to permit it for testing. */ /* This normally shouldn't happen, but it's helpful to permit it for testing. */
LOG->Warn( "GetExtraStageInfo() called in GROUP_ALL, but GAMESTATE->m_pCurSong == NULL" ); LOG->Warn( "GetExtraStageInfo() called in GROUP_ALL, but GAMESTATE->m_pCurSong == NULL" );
GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() ); GAMESTATE->m_pCurSong.Set( GetRandomSong() );
} }
sGroup = GAMESTATE->m_pCurSong->m_sGroupName; sGroup = GAMESTATE->m_pCurSong->m_sGroupName;
} }