remove highscore clamping abilities and related checks since it doesn…

…t even affect the new scoreman anyway
jameskr97 · Jun 10, 2017 · c10733b · c10733b
1 parent d1d1829
commit c10733b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 39 deletions.
diff --git a/src/HighScore.cpp b/src/HighScore.cpp
@@ -868,8 +868,6 @@ void HighScoreList::AddHighScore( HighScore hs, int &iIndexOut, bool bIsMachine
 	// and not here so that we don't end up with fewer than iMaxScores after 
 	// removing HighScores with duplicate names.
 	//
-	if( !bIsMachine )
-		ClampSize( bIsMachine );
 	HighGrade = min( hs.GetWifeGrade(), HighGrade);
 }
 
@@ -964,18 +962,6 @@ void HighScoreList::RemoveAllButOneOfEachName()
 	}
 }
 
-/* commented out functionality instead of obliterating in 
-case some of you for whatever reason want to reenable this
-- Mina */
-void HighScoreList::ClampSize( bool bIsMachine )
-{
-	const int iMaxScores = bIsMachine ? 
-		PREFSMAN->m_iMaxHighScoresPerListForMachine : 
-		PREFSMAN->m_iMaxHighScoresPerListForPlayer;
-	//if( vHighScores.size() > unsigned(iMaxScores) )		
-	//	vHighScores.erase( vHighScores.begin()+iMaxScores, vHighScores.end() );
-}
-
 void HighScoreList::MergeFromOtherHSL(HighScoreList& other, bool is_machine)
 {
 	iNumTimesPlayed+= other.iNumTimesPlayed;
@@ -991,7 +977,6 @@ void HighScoreList::MergeFromOtherHSL(HighScoreList& other, bool is_machine)
 	vHighScores.erase(unique_end, vHighScores.end());
 	// Reverse it because sort moved the lesser scores to the top.
 	std::reverse(vHighScores.begin(), vHighScores.end());
-	ClampSize(is_machine);
 }
 
 XNode* Screenshot::CreateNode() const

diff --git a/src/HighScore.h b/src/HighScore.h
@@ -179,7 +179,6 @@ struct HighScoreList
 	void AddHighScore( HighScore hs, int &iIndexOut, bool bIsMachine );
 	void IncrementPlayCount( DateTime dtLastPlayed );
 	void RemoveAllButOneOfEachName();
-	void ClampSize( bool bIsMachine );
 
 	void MergeFromOtherHSL(HighScoreList& other, bool is_machine);
 

diff --git a/src/StageStats.cpp b/src/StageStats.cpp
@@ -282,31 +282,10 @@ void StageStats::FinalizeScores(bool bSummary)
 	LOG->Trace("done saving stats and high scores");
 }
 
+// all scores are saved so all scores are highscores, remove this later -mina
 bool StageStats::PlayerHasHighScore( PlayerNumber pn ) const
 {
-	const Song *pSong = m_vpPlayedSongs[0];
-	const Steps *pSteps = m_player[pn].m_vpPossibleSteps[0];
-
-	// Don't show high scores for tutorial songs.
-	if( pSong->IsTutorial() == Song::SHOW_NEVER )
-		return false;
-
-	const HighScoreList &hsl = 	PROFILEMAN->GetProfile(pn)->GetStepsHighScoreList(pSong, pSteps);
-
-	int iScore = m_player[pn].m_iScore;
-	float fPercentDP = m_player[pn].GetPercentDancePoints();
-	for( int h=0; h<(int)hsl.vHighScores.size() && h<PREFSMAN->m_iMaxHighScoresPerListForMachine; ++h )
-	{
-		const HighScore &hs = hsl.vHighScores[h];
-		if( hs.GetName() == RANKING_TO_FILL_IN_MARKER[pn]  &&
-			hs.GetPercentDP() == fPercentDP  && 
-			hs.GetScore() == iScore )
-		{
-			return true;
-		}
-	}
-
-	return false;
+	return true;
 }
 
 unsigned int StageStats::GetMinimumMissCombo() const