h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 10:42:55 +08:00
Code Issues Releases Wiki Activity

More cleanups

Browse Source
This commit is contained in:
smoogipooo 2017-09-12 21:12:57 +09:00
parent abab2a4878
commit 3e3618d724
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Catch.Objects; using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
@ -18,10 +17,5 @@ namespace osu.Game.Rulesets.Catch.Scoring
: base(rulesetContainer) : base(rulesetContainer)
{ {
} }
protected override void OnNewJudgement(Judgement judgement)
{
base.OnNewJudgement(judgement);
}
} }
} }

1
osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Linq; using System.Linq;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;

2
osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects.Drawables; 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.Judgements;
using osu.Game.Rulesets.Taiko.Objects; using osu.Game.Rulesets.Taiko.Objects;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using OpenTK;
namespace osu.Game.Rulesets.Taiko.Scoring namespace osu.Game.Rulesets.Taiko.Scoring
{ {

15
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using System.Collections.Generic;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
@ -140,18 +139,13 @@ namespace osu.Game.Rulesets.Scoring
{ {
private const double max_score = 1000000; private const double max_score = 1000000;
/// <summary>
/// All judgements held by this ScoreProcessor.
/// </summary>
protected readonly List<Judgement> Judgements = new List<Judgement>();
protected virtual double ComboPortion => 0.5f; protected virtual double ComboPortion => 0.5f;
protected virtual double AccuracyPortion => 0.5f; protected virtual double AccuracyPortion => 0.5f;
protected int MaxHits { get; private set; } protected readonly int MaxHits;
protected int Hits { get; private set; } protected int Hits { get; private set; }
private double maxComboScore; private readonly double maxComboScore;
private double comboScore; private double comboScore;
protected ScoreProcessor() protected ScoreProcessor()
@ -160,8 +154,6 @@ namespace osu.Game.Rulesets.Scoring
protected ScoreProcessor(RulesetContainer<TObject> rulesetContainer) protected ScoreProcessor(RulesetContainer<TObject> rulesetContainer)
{ {
Judgements.Capacity = rulesetContainer.Beatmap.HitObjects.Count;
rulesetContainer.OnJudgement += AddJudgement; rulesetContainer.OnJudgement += AddJudgement;
ComputeTargets(rulesetContainer.Beatmap); ComputeTargets(rulesetContainer.Beatmap);
@ -197,7 +189,6 @@ namespace osu.Game.Rulesets.Scoring
} }
} }
Judgements.Add(judgement);
OnNewJudgement(judgement); OnNewJudgement(judgement);
NotifyNewJudgement(judgement); NotifyNewJudgement(judgement);
@ -240,8 +231,6 @@ namespace osu.Game.Rulesets.Scoring
{ {
base.Reset(); base.Reset();
Judgements.Clear();
Hits = 0; Hits = 0;
comboScore = 0; comboScore = 0;
} }