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

Duplicate step check with #CREDIT.

Browse Source
This commit is contained in:
Jason Felds
2011-02-11 01:55:44 -05:00
parent ba55653468
commit 3f1bed5925
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SongUtil.cpp
+5 -3
View File
@@ -293,7 +293,7 @@ static RString RemoveInitialWhitespace( RString s )
void SongUtil::DeleteDuplicateSteps( Song *pSong, vector<Steps*> &vSteps ) void SongUtil::DeleteDuplicateSteps( Song *pSong, vector<Steps*> &vSteps )
{ {
/* vSteps have the same StepsType and Difficulty. Delete them if they have the /* vSteps have the same StepsType and Difficulty. Delete them if they have the
* same m_sDescription, m_iMeter and SMNoteData. */ * same m_sDescription, m_sCredit, m_iMeter and SMNoteData. */
CHECKPOINT; CHECKPOINT;
for( unsigned i=0; i<vSteps.size(); i++ ) for( unsigned i=0; i<vSteps.size(); i++ )
{ {
@@ -307,6 +307,8 @@ void SongUtil::DeleteDuplicateSteps( Song *pSong, vector<Steps*> &vSteps )
if( s1->GetDescription() != s2->GetDescription() ) if( s1->GetDescription() != s2->GetDescription() )
continue; continue;
if( s1->GetCredit() != s2->GetCredit() )
continue;
if( s1->GetMeter() != s2->GetMeter() ) if( s1->GetMeter() != s2->GetMeter() )
continue; continue;
/* Compare, ignoring whitespace. */ /* Compare, ignoring whitespace. */
@@ -317,8 +319,8 @@ void SongUtil::DeleteDuplicateSteps( Song *pSong, vector<Steps*> &vSteps )
if( RemoveInitialWhitespace(sSMNoteData1) != RemoveInitialWhitespace(sSMNoteData2) ) if( RemoveInitialWhitespace(sSMNoteData1) != RemoveInitialWhitespace(sSMNoteData2) )
continue; continue;
LOG->Trace("Removed %p duplicate steps in song \"%s\" with description \"%s\" and meter \"%i\"", LOG->Trace("Removed %p duplicate steps in song \"%s\" with description \"%s\", step author \"%s\", and meter \"%i\"",
s2, pSong->GetSongDir().c_str(), s1->GetDescription().c_str(), s1->GetMeter() ); s2, pSong->GetSongDir().c_str(), s1->GetDescription().c_str(), s1->GetCredit().c_str(), s1->GetMeter() );
pSong->DeleteSteps( s2, false ); pSong->DeleteSteps( s2, false );