diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 15d0b9c5fb..18a66c9631 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -493,12 +493,10 @@ static void GetImageDirListing( CString sPath, CStringArray &AddTo, bool bReturn /* This is called within TidyUpData, before autogen notes are added. */ static void DeleteDuplicateSteps( Song *song, vector &vSteps ) { - CHECKPOINT; /* vSteps have the same StepsType and Difficulty. Delete them if they have the * same m_sDescription, m_iMeter and SMNoteData. */ for( unsigned i=0; i &vSteps ) if( s1->GetSMNoteData() != s2->GetSMNoteData() ) continue; - CHECKPOINT; LOG->Trace("Removed duplicate steps in song \"%s\" with description \"%s\" and meter \"%i\"", song->GetSongDir().c_str(), s1->GetDescription().c_str(), s1->GetMeter() ); - CHECKPOINT; - /* 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-- ) @@ -528,13 +523,10 @@ static void DeleteDuplicateSteps( Song *song, vector &vSteps ) } } - CHECKPOINT; vSteps.erase(vSteps.begin()+j); - CHECKPOINT; --j; } } - CHECKPOINT; }