diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index fa5a9fc7c1..d5509538fd 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Scoring
/// The array of s to reorder.
/// The given ordered by decreasing total score.
public IEnumerable OrderByTotalScore(IEnumerable scores)
- => scores.OrderByDescending(s => GetTotalScore(s))
+ => scores.OrderByDescending(s => s.TotalScore)
.ThenBy(s => s.OnlineID)
// Local scores may not have an online ID. Fall back to date in these cases.
.ThenBy(s => s.Date);
@@ -88,7 +88,7 @@ namespace osu.Game.Scoring
///
/// The to retrieve the bindable for.
/// The bindable containing the total score.
- public Bindable GetBindableTotalScore([NotNull] ScoreInfo score) => new TotalScoreBindable(score, this, configManager);
+ public Bindable GetBindableTotalScore([NotNull] ScoreInfo score) => new TotalScoreBindable(score, configManager);
///
/// Retrieves a bindable that represents the formatted total score string of a .
@@ -100,14 +100,6 @@ namespace osu.Game.Scoring
/// The bindable containing the formatted total score string.
public Bindable GetBindableTotalScoreString([NotNull] ScoreInfo score) => new TotalScoreStringBindable(GetBindableTotalScore(score));
- ///
- /// Retrieves the total score of a in the given .
- ///
- /// The to calculate the total score of.
- /// The to return the total score as.
- /// The total score.
- public long GetTotalScore([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised) => score.GetDisplayScore(mode);
-
///
/// Retrieves the maximum achievable combo for the provided score.
///
@@ -126,12 +118,11 @@ namespace osu.Game.Scoring
/// Creates a new .
///
/// The to provide the total score of.
- /// The .
/// The config.
- public TotalScoreBindable(ScoreInfo score, ScoreManager scoreManager, OsuConfigManager configManager)
+ public TotalScoreBindable(ScoreInfo score, OsuConfigManager configManager)
{
configManager?.BindWith(OsuSetting.ScoreDisplayMode, scoringMode);
- scoringMode.BindValueChanged(mode => Value = scoreManager.GetTotalScore(score, mode.NewValue), true);
+ scoringMode.BindValueChanged(mode => Value = score.GetDisplayScore(mode.NewValue), true);
}
}
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 29dec42083..1f93389e94 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Ranking
var score = trackingContainer.Panel.Score;
- flow.SetLayoutPosition(trackingContainer, scoreManager.GetTotalScore(score));
+ flow.SetLayoutPosition(trackingContainer, score.TotalScore);
trackingContainer.Show();