move skillset resets to highscore and clear constructed timing/noteda…

…ta after recalcing
etternagame · May 30, 2017 · 6aa1055 · 6aa1055
1 parent 04dce35
commit 6aa1055
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/src/HighScore.cpp b/src/HighScore.cpp
@@ -62,6 +62,7 @@ struct HighScoreImpl
 	void LoadFromEttNode(const XNode *pNode);
 	Grade GetWifeGrade() const;
 	void UnloadReplayData();
+	void ResetSkillsets();
 
 	bool WriteReplayData(bool duringload);
 
@@ -206,6 +207,11 @@ vector<int> HighScoreImpl::NoteRowsToVector(RString s) {
 	return o;
 }
 
+void HighScoreImpl::ResetSkillsets() {
+	FOREACH_ENUM(Skillset, ss)
+		fSkillsetSSRs[ss] = 0.f;
+}
+
 HighScoreImpl::HighScoreImpl()
 {
 	sName = "";
@@ -656,6 +662,10 @@ void HighScore::UnloadReplayData() {
 	m_Impl->UnloadReplayData();
 }
 
+void HighScore::ResetSkillsets() {
+	m_Impl->ResetSkillsets();
+}
+
 /* We normally don't give direct access to the members.  We need this one
  * for NameToFillIn; use a special accessor so it's easy to find where this
  * is used. */

diff --git a/src/HighScore.h b/src/HighScore.h
@@ -131,6 +131,7 @@ struct HighScore
 	bool LoadReplayData(bool duringload);
 	bool HasReplayData();
 	void UnloadReplayData();
+	void ResetSkillsets();
 
 	string GetDisplayName() const;
 

diff --git a/src/ScoreManager.cpp b/src/ScoreManager.cpp
@@ -171,39 +171,44 @@ void ScoreManager::RecalculateSSRs() {
 		HighScore* hs = AllScores[i];
 		Steps* steps = SONGMAN->GetStepsByChartkey(hs->GetChartKey());
 
-		if (!steps)
+		if (!steps) {
+			hs->ResetSkillsets();
 			continue;
+		}
 
 		if (!steps->IsRecalcValid()) {
-			FOREACH_ENUM(Skillset, ss)
-				hs->SetSkillsetSSR(ss, 0.f);
+			hs->ResetSkillsets();
 			continue;
 		}
 
 		float ssrpercent = hs->GetSSRNormPercent();
 		float musicrate = hs->GetMusicRate();
 
 		if (ssrpercent <= 0.f || hs->GetGrade() == Grade_Failed) {
-			FOREACH_ENUM(Skillset, ss)
-				hs->SetSkillsetSSR(ss, 0.f);
+			hs->ResetSkillsets();
 			continue;
 		}
 
-		if (hs->GetSSRCalcVersion() == GetCalcVersion())
-			continue;
+		//if (hs->GetSSRCalcVersion() == GetCalcVersion())
+			//continue;
 
+		steps->Decompress();
 		TimingData* td = steps->GetTimingData();
 		NoteData& nd = steps->GetNoteData();
 
 		nd.LogNonEmptyRows();
-		auto& nerv = nd.GetNonEmptyRowVector();
-		const vector<float>& etaner = td->BuildAndGetEtaner(nerv);
-		auto& serializednd = nd.SerializeNoteData(etaner);
+		auto nerv = nd.GetNonEmptyRowVector();
+		auto etaner = td->BuildAndGetEtaner(nerv);
+		auto serializednd = nd.SerializeNoteData(etaner);
 
-		auto& dakine = MinaSDCalc(serializednd, steps->GetNoteData().GetNumTracks(), musicrate, ssrpercent, 1.f, false);
+		auto dakine = MinaSDCalc(serializednd, steps->GetNoteData().GetNumTracks(), musicrate, ssrpercent, 1.f, td->HasWarps());
 		FOREACH_ENUM(Skillset, ss)
 			hs->SetSkillsetSSR(ss, dakine[ss]);
 		hs->SetSSRCalcVersion(GetCalcVersion());
+
+		td->UnsetElapsedTimesAtAllRows();
+		nd.UnsetNerv();
+		nd.UnsetSerializedNoteData();
 	}
 	return;
 }