don't touch an offset unless it's actually graded

This commit is contained in:
Glenn Maynard
2003-03-26 22:22:44 +00:00
parent d97838ebaa
commit 6dffee38ce
+6 -3
View File
@@ -12,7 +12,7 @@
#include "NoteDataWithScoring.h" #include "NoteDataWithScoring.h"
#include "RageLog.h"
NoteDataWithScoring::NoteDataWithScoring() NoteDataWithScoring::NoteDataWithScoring()
{ {
@@ -114,7 +114,7 @@ TapNoteScore NoteDataWithScoring::MinTapNoteScore(unsigned row) const
/* Return the last tap score of a row: the grade of the tap that completed /* Return the last tap score of a row: the grade of the tap that completed
* the row. If the row isn't complete (not all taps have been hit), return * the row. If the row isn't complete (not all taps have been hit), return
* TNS_NONE or TNS_MISS. */ * TNS_MISS. */
TapNoteScore NoteDataWithScoring::LastTapNoteScore(unsigned row) const TapNoteScore NoteDataWithScoring::LastTapNoteScore(unsigned row) const
{ {
TapNoteScore score = TNS_MARVELOUS; TapNoteScore score = TNS_MARVELOUS;
@@ -124,10 +124,13 @@ TapNoteScore NoteDataWithScoring::LastTapNoteScore(unsigned row) const
/* If there's no tap note on this row, skip it; the score will always be TNS_NONE. */ /* If there's no tap note on this row, skip it; the score will always be TNS_NONE. */
if(GetTapNote(t, row) == TAP_EMPTY) continue; if(GetTapNote(t, row) == TAP_EMPTY) continue;
TapNoteScore tns = GetTapNoteScore(t, row);
if(tns == TNS_MISS) return TNS_MISS;
float tm = GetTapNoteOffset(t, row); float tm = GetTapNoteOffset(t, row);
if(tm < scoretime) continue; if(tm < scoretime) continue;
score = GetTapNoteScore(t, row); score = tns;
scoretime = tm; scoretime = tm;
} }