From 3180cb7584c037463ee5c2047aea3e3ed0f0b364 Mon Sep 17 00:00:00 2001 From: simong4 Date: Tue, 4 Apr 2023 20:38:06 -0400 Subject: Gestion Muons + Ecran de fin de chanson -Gestion du multiplicateur des muons (Divine Intervention) -Ajout d'un ecran de fin de chanson indiquant le nombre de points et le pourcentage de notes reussies -Correction d'un bug lors du "parse" des .chart --- song.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'song.cpp') diff --git a/song.cpp b/song.cpp index 6fc03a2..ced9187 100644 --- a/song.cpp +++ b/song.cpp @@ -296,13 +296,13 @@ void Song::consolidateChords(int difficulty){ int chordSize = chords->size(); // Go through all the chords for (int i=0; iat(i); + ChordNote * currentChord = &chords->at(i); // Check if any other chord past the current one // has the same start and end time for (int j=i+1; jat(j); - if (currentChord.getStart() == nextChord.getStart() && - currentChord.getEnd() == nextChord.getEnd()){ + if (currentChord->getStart() == nextChord.getStart() && + currentChord->getEnd() == nextChord.getEnd()){ // If so: // - add the fret to the current chord // - remove the next one @@ -316,7 +316,7 @@ void Song::consolidateChords(int difficulty){ nextChord.print(); std::cout << " ="; #endif // DEBUG - currentChord.merge(nextChord); + currentChord->merge(nextChord); #ifdef DEBUG currentChord.print(); #endif -- cgit v1.2.3