From fa201be2adb1ef8c7382ea578585854d476bc128 Mon Sep 17 00:00:00 2001 From: Lucas A Date: Thu, 8 Oct 2020 18:31:29 +0200 Subject: [PATCH] Simplify PerformanceCacheLookup --- osu.Game/Scoring/ScorePerformanceManager.cs | 26 +++++---------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/osu.Game/Scoring/ScorePerformanceManager.cs b/osu.Game/Scoring/ScorePerformanceManager.cs index 0189a86172..783425052f 100644 --- a/osu.Game/Scoring/ScorePerformanceManager.cs +++ b/osu.Game/Scoring/ScorePerformanceManager.cs @@ -9,7 +9,6 @@ using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Game.Beatmaps; -using osu.Game.Rulesets.Mods; namespace osu.Game.Scoring { @@ -57,34 +56,21 @@ namespace osu.Game.Scoring public readonly struct PerformanceCacheLookup { - public readonly double Accuracy; - public readonly int BeatmapId; - public readonly long TotalScore; - public readonly int Combo; - public readonly Mod[] Mods; - public readonly int RulesetId; + public readonly string ScoreHash; + public readonly int LocalId; public PerformanceCacheLookup(ScoreInfo info) { - Accuracy = info.Accuracy; - BeatmapId = info.Beatmap.ID; - TotalScore = info.TotalScore; - Combo = info.Combo; - Mods = info.Mods; - RulesetId = info.Ruleset.ID ?? 0; + ScoreHash = info.Hash; + LocalId = info.ID; } public override int GetHashCode() { var hash = new HashCode(); - hash.Add(Accuracy); - hash.Add(BeatmapId); - hash.Add(TotalScore); - hash.Add(Combo); - hash.Add(RulesetId); - foreach (var mod in Mods) - hash.Add(mod); + hash.Add(ScoreHash); + hash.Add(LocalId); return hash.ToHashCode(); }