fix nrv to timestamp converter and account for rate

technically it shouldnt matter for the sake of the plot however we might as well be thorough
etternagame · Nov 22, 2017 · 71b8795 · 71b8795
1 parent e09236e
commit 71b8795
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/StageStats.cpp b/src/StageStats.cpp
@@ -278,7 +278,7 @@ static HighScore FillInHighScore(const PlayerStageStats &pss, const PlayerState
 			auto steps = SONGMAN->GetStepsByChartkey(hs.GetChartKey());
 			auto td = steps->GetTimingData();
 			SCOREMAN->SetAllTopScores();	// this is super lazy and a chart specific function should be made -mina
-			hs.timeStamps = td->ConvertReplayNoteRowsToTimestamps(pss.GetNoteRowVector());
+			hs.timeStamps = td->ConvertReplayNoteRowsToTimestamps(pss.GetNoteRowVector(), hs.GetMusicRate());
 			DLMAN->UploadScore(&hs);
 			hs.timeStamps.clear();
 			hs.timeStamps.shrink_to_fit();

diff --git a/src/TimingData.cpp b/src/TimingData.cpp
@@ -1413,10 +1413,10 @@ float TimingData::WhereUAtBroNoOffset(float beat) const {
 	return GetElapsedTimeFromBeatNoOffset(beat);
 }
 
-vector<float> TimingData::ConvertReplayNoteRowsToTimestamps(vector<int> nrv) {
+vector<float> TimingData::ConvertReplayNoteRowsToTimestamps(vector<int> nrv, float rate) {
 	vector<float> o;
 	for (auto nr : nrv)
-		o.emplace_back(WhereUAtBroNoOffset(nr));
+		o.emplace_back(WhereUAtBro(nr) / rate);
 	return o;
 }
 

diff --git a/src/TimingData.h b/src/TimingData.h
@@ -483,7 +483,7 @@ class TimingData
 	float WhereUAtBroNoOffset(float beat);
 	float WhereUAtBro(int row);
 
-	vector<float> ConvertReplayNoteRowsToTimestamps(vector<int> nrv);
+	vector<float> ConvertReplayNoteRowsToTimestamps(vector<int> nrv, float rate);
 
 	bool ValidSequentialAssumption = true;
 	void InvalidateSequentialAssmption() { ValidSequentialAssumption = false; }