call recalculatessr after gameplay again... because calling it during…

… song load hopelessly breaks some scores
etternagame · May 30, 2017 · 1fa8e3f · 1fa8e3f
1 parent 35a6438
commit 1fa8e3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Profile.cpp b/src/Profile.cpp
@@ -827,7 +827,7 @@ ProfileLoadResult Profile::LoadAllFromDir( const RString &sDir, bool bRequireSig
 		ImportScoresToEtterna();
 	}
 
-	LoadOldEttFromDir(sDir);
+	//LoadOldEttFromDir(sDir);
 
 	CalculateStatsFromScores();
 	return ProfileLoadResult_Success;
@@ -1049,6 +1049,7 @@ ProfileLoadResult Profile::LoadEttXmlFromNode(const XNode *xml) {
 }
 
 void Profile::CalculateStatsFromScores() {
+	LOG->Trace("Calculating stats from scores");
 	vector<HighScore*> all = SCOREMAN->GetAllScores();
 	float TotalGameplaySeconds = 0.f;
 	m_iTotalTapsAndHolds = 0;
@@ -1071,9 +1072,6 @@ void Profile::CalculateStatsFromScores() {
 	m_iTotalDancePoints = m_iTotalTapsAndHolds * 2;
 	m_iTotalGameplaySeconds = static_cast<int>(TotalGameplaySeconds);
 
-	// for some reason this is a lot slower than it should be when called here...? -mina
-	SCOREMAN->RecalculateSSRs();
-
 	SCOREMAN->CalcPlayerRating(m_fPlayerRating, m_fPlayerSkillsets);
 }
 

diff --git a/src/StatsManager.cpp b/src/StatsManager.cpp
@@ -103,11 +103,11 @@ void StatsManager::CalcAccumPlayedStageStats()
 	m_AccumPlayedStageStats = AccumPlayedStageStats( m_vPlayedStageStats );
 }
 
-// almost deadcode -mina
+// fffff this is back here because some scores/files dont calc properly if called during load -mina
 void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNumber pn )
 {
+	SCOREMAN->RecalculateSSRs();
 	SCOREMAN->CalcPlayerRating(pProfile->m_fPlayerRating, pProfile->m_fPlayerSkillsets);
-	return;
 }
 
 void StatsManager::CommitStatsToProfiles( const StageStats *pSS )