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

stop accessing Song::m_vpSteps directly

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-04 23:29:13 +00:00
parent 693eee576a
commit c266c71dca
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+9 -6
View File
@@ -391,9 +391,10 @@ RageColor SongManager::GetSongColor( const Song* pSong )
* set up, which is too restrictive. How to handle this?
*/
// const StepsType st = GAMESTATE->GetCurrentStyleDef()->m_StepsType;
for( unsigned i=0; i<pSong->m_vpSteps.size(); i++ )
const vector<Steps*>& vpSteps = pSong->GetAllSteps();
for( unsigned i=0; i<vpSteps.size(); i++ )
{
const Steps* pSteps = pSong->m_vpSteps[i];
const Steps* pSteps = vpSteps[i];
switch( pSteps->GetDifficulty() )
{
case DIFFICULTY_CHALLENGE:
@@ -660,9 +661,10 @@ void SongManager::Cleanup()
for( unsigned i=0; i<m_pSongs.size(); i++ )
{
Song* pSong = m_pSongs[i];
for( unsigned n=0; n<pSong->m_vpSteps.size(); n++ )
const vector<Steps*>& vpSteps = pSong->GetAllSteps();
for( unsigned n=0; n<vpSteps.size(); n++ )
{
Steps* pSteps = pSong->m_vpSteps[n];
Steps* pSteps = vpSteps[n];
pSteps->Compress();
}
}
@@ -1100,8 +1102,9 @@ static bool CheckPointer( const Steps *p )
const vector<Song*> &songs = SONGMAN->GetAllSongs();
for( unsigned i = 0; i < songs.size(); ++i )
{
for( unsigned j = 0; j < songs.size(); ++j )
if( songs[i]->m_vpSteps[j] == p )
const vector<Steps*>& vpSteps = songs[i]->GetAllSteps();
for( unsigned j = 0; j < vpSteps.size(); ++j )
if( vpSteps[j] == p )
return true;
}
return false;