diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs index cd2a81038a..11e95622ca 100644 --- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs +++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs @@ -2,7 +2,6 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Rulesets.Catch.Objects; -using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; @@ -18,10 +17,5 @@ namespace osu.Game.Rulesets.Catch.Scoring : base(rulesetContainer) { } - - protected override void OnNewJudgement(Judgement judgement) - { - base.OnNewJudgement(judgement); - } } } diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs index 06ba82205d..92e661203d 100644 --- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs +++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs @@ -1,7 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Linq; using osu.Game.Beatmaps; using osu.Game.Rulesets.Judgements; diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs index 18625df508..a629dae9fa 100644 --- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs +++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs @@ -1,7 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using osu.Game.Beatmaps; using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Objects.Drawables; @@ -9,7 +8,6 @@ using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Taiko.Judgements; using osu.Game.Rulesets.Taiko.Objects; using osu.Game.Rulesets.UI; -using OpenTK; namespace osu.Game.Rulesets.Taiko.Scoring { diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index 213b92486a..43fdd99fa5 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -2,7 +2,6 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.Collections.Generic; using osu.Framework.Configuration; using osu.Game.Beatmaps; using osu.Game.Rulesets.Judgements; @@ -140,18 +139,13 @@ namespace osu.Game.Rulesets.Scoring { private const double max_score = 1000000; - /// - /// All judgements held by this ScoreProcessor. - /// - protected readonly List Judgements = new List(); - protected virtual double ComboPortion => 0.5f; protected virtual double AccuracyPortion => 0.5f; - protected int MaxHits { get; private set; } + protected readonly int MaxHits; protected int Hits { get; private set; } - private double maxComboScore; + private readonly double maxComboScore; private double comboScore; protected ScoreProcessor() @@ -160,8 +154,6 @@ namespace osu.Game.Rulesets.Scoring protected ScoreProcessor(RulesetContainer rulesetContainer) { - Judgements.Capacity = rulesetContainer.Beatmap.HitObjects.Count; - rulesetContainer.OnJudgement += AddJudgement; ComputeTargets(rulesetContainer.Beatmap); @@ -197,7 +189,6 @@ namespace osu.Game.Rulesets.Scoring } } - Judgements.Add(judgement); OnNewJudgement(judgement); NotifyNewJudgement(judgement); @@ -240,8 +231,6 @@ namespace osu.Game.Rulesets.Scoring { base.Reset(); - Judgements.Clear(); - Hits = 0; comboScore = 0; }