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

Don't use RemoveNotes in DeleteDuplicateSteps.

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-07 03:54:21 +00:00
parent 3a76264c14
commit e90ab78c63
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+14 -1
View File
@@ -490,6 +490,7 @@ static void GetImageDirListing( CString sPath, CStringArray &AddTo, bool bReturn
GetDirListing( sPath + ".gif", AddTo, false, bReturnPathToo ); GetDirListing( sPath + ".gif", AddTo, false, bReturnPathToo );
} }
/* This is called within TidyUpData, before autogen notes are added. */
static void DeleteDuplicateSteps( Song *song, vector<Steps*> &vSteps ) static void DeleteDuplicateSteps( Song *song, vector<Steps*> &vSteps )
{ {
CHECKPOINT; CHECKPOINT;
@@ -514,7 +515,19 @@ static void DeleteDuplicateSteps( Song *song, vector<Steps*> &vSteps )
song->GetSongDir().c_str(), s1->GetDescription().c_str(), s1->GetMeter() ); song->GetSongDir().c_str(), s1->GetDescription().c_str(), s1->GetMeter() );
CHECKPOINT; CHECKPOINT;
song->RemoveNotes(s2);
/* Don't use RemoveNotes; autogen notes havn't yet been created and it'll
* create them. */
for( int k=song->m_apNotes.size()-1; k>=0; k-- )
{
if( song->m_apNotes[k] == s2 )
{
delete song->m_apNotes[k];
song->m_apNotes.erase( song->m_apNotes.begin()+k );
break;
}
}
CHECKPOINT; CHECKPOINT;
vSteps.erase(vSteps.begin()+j); vSteps.erase(vSteps.begin()+j);
CHECKPOINT; CHECKPOINT;