fix replays always dropping first note on playback if hit early

etternagame · Jan 8, 2023 · 9addca6 · 9addca6
1 parent 482ac7e
commit 9addca6
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Etterna/Models/HighScore/Replay.cpp b/src/Etterna/Models/HighScore/Replay.cpp
@@ -2879,9 +2879,17 @@ Replay::GeneratePlaybackEvents(int startRow) -> std::map<int, std::vector<Playba
 		const auto positionSeconds = evt.songPositionSeconds;
 
 		const auto noterow =
-		  BeatToNoteRow(td->GetBeatFromElapsedTimeNoOffset(positionSeconds));
-		if (noterow < startRow) {
-			continue;
+		  BeatToNoteRow(td->GetBeatFromElapsedTime(positionSeconds));
+		if (evt.nearestTapNoterow < startRow) {
+			if (evt.nearestTapNoterow == -1) {
+				// for ghost taps, only remove them if they are truly too early
+				if (noterow < startRow) {
+					continue;
+				}
+			} else {
+				// these are taps which judge a note earlier than we care
+				continue;
+			}
 		}
 
 		PlaybackEvent playback(noterow, positionSeconds, column, isPress);