Course::pSong to SongID

This commit is contained in:
Glenn Maynard
2007-08-12 22:43:45 +00:00
parent b4e24a2039
commit 8022c3ba04
9 changed files with 43 additions and 36 deletions
+3 -3
View File
@@ -1736,7 +1736,7 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
bool bUsesThisSong = false;
for( unsigned e = 0; e < crs->m_vEntries.size(); ++e )
{
if( crs->m_vEntries[e].pSong != m_pSong )
if( crs->m_vEntries[e].songID.ToSong() != m_pSong )
continue;
bUsesThisSong = true;
}
@@ -2502,7 +2502,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
int iCourseEntryIndex = -1;
FOREACH_CONST( CourseEntry, pCourse->m_vEntries, i )
{
if( i->pSong == GAMESTATE->m_pCurSong.Get() )
if( i->songID.ToSong() == GAMESTATE->m_pCurSong.Get() )
iCourseEntryIndex = i - pCourse->m_vEntries.begin();
}
@@ -3487,7 +3487,7 @@ void ScreenEdit::SetupCourseAttacks()
for( unsigned e = 0; e < GAMESTATE->m_pCurCourse->m_vEntries.size(); ++e )
{
if( GAMESTATE->m_pCurCourse->m_vEntries[e].pSong != m_pSong )
if( GAMESTATE->m_pCurCourse->m_vEntries[e].songID.ToSong() != m_pSong )
continue;
Attacks = GAMESTATE->m_pCurCourse->m_vEntries[e].attacks;