From badc8def9ae4d12528c70f131017011321c2f294 Mon Sep 17 00:00:00 2001 From: TocoToucan Date: Wed, 18 Jan 2017 18:51:38 +0300 Subject: [PATCH] hitObjectsNumber -> hitObjectCount --- osu.Game.Modes.Catch/CatchRuleset.cs | 2 +- osu.Game.Modes.Mania/ManiaRuleset.cs | 2 +- osu.Game.Modes.Osu/OsuRuleset.cs | 2 +- osu.Game.Modes.Osu/OsuScoreProcessor.cs | 4 ++-- osu.Game.Modes.Taiko/TaikoRuleset.cs | 2 +- osu.Game/Modes/Ruleset.cs | 2 +- osu.Game/Modes/ScoreProcesssor.cs | 8 ++++++-- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs index d70b2f4513..9ee0e2c4c3 100644 --- a/osu.Game.Modes.Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -18,7 +18,7 @@ namespace osu.Game.Modes.Catch protected override PlayMode PlayMode => PlayMode.Catch; - public override ScoreProcessor CreateScoreProcessor(int hitObjectsNumber) => null; + public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null; public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser(); } diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs index 94e6049402..6671b0efaf 100644 --- a/osu.Game.Modes.Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -19,7 +19,7 @@ namespace osu.Game.Modes.Mania protected override PlayMode PlayMode => PlayMode.Mania; - public override ScoreProcessor CreateScoreProcessor(int hitObjectsNumber) => null; + public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null; public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser(); } diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs index e81b623d73..259a8c3880 100644 --- a/osu.Game.Modes.Osu/OsuRuleset.cs +++ b/osu.Game.Modes.Osu/OsuRuleset.cs @@ -17,7 +17,7 @@ namespace osu.Game.Modes.Osu public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser(); - public override ScoreProcessor CreateScoreProcessor(int hitObjectsNumber) => new OsuScoreProcessor(hitObjectsNumber); + public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => new OsuScoreProcessor(hitObjectCount); protected override PlayMode PlayMode => PlayMode.Osu; } diff --git a/osu.Game.Modes.Osu/OsuScoreProcessor.cs b/osu.Game.Modes.Osu/OsuScoreProcessor.cs index e10678b8b3..73726d21f4 100644 --- a/osu.Game.Modes.Osu/OsuScoreProcessor.cs +++ b/osu.Game.Modes.Osu/OsuScoreProcessor.cs @@ -8,8 +8,8 @@ namespace osu.Game.Modes.Osu { class OsuScoreProcessor : ScoreProcessor { - public OsuScoreProcessor(int hitObjectsNumber) - : base(hitObjectsNumber) + public OsuScoreProcessor(int hitObjectCount) + : base(hitObjectCount) { } diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs index b7e677792c..b8a066bc8b 100644 --- a/osu.Game.Modes.Taiko/TaikoRuleset.cs +++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs @@ -19,7 +19,7 @@ namespace osu.Game.Modes.Taiko protected override PlayMode PlayMode => PlayMode.Taiko; - public override ScoreProcessor CreateScoreProcessor(int hitObjectsNumber) => null; + public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null; public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser(); } diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs index e3aea99991..e0f4ce4e98 100644 --- a/osu.Game/Modes/Ruleset.cs +++ b/osu.Game/Modes/Ruleset.cs @@ -18,7 +18,7 @@ namespace osu.Game.Modes public abstract ScoreOverlay CreateScoreOverlay(); - public abstract ScoreProcessor CreateScoreProcessor(int hitObjectsNumber); + public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount); public abstract HitRenderer CreateHitRendererWith(List objects); diff --git a/osu.Game/Modes/ScoreProcesssor.cs b/osu.Game/Modes/ScoreProcesssor.cs index a6cf8857b6..0b89a2d749 100644 --- a/osu.Game/Modes/ScoreProcesssor.cs +++ b/osu.Game/Modes/ScoreProcesssor.cs @@ -31,10 +31,14 @@ namespace osu.Game.Modes public readonly List Judgements; - public ScoreProcessor(int hitObjectsNumber) + /// + /// Initializes a new instance of the class. + /// + /// Number of HitObjects. It is used for specifying Judgements collection Capacity + public ScoreProcessor(int hitObjectCount = 0) { Combo.ValueChanged += delegate { HighestCombo.Value = Math.Max(HighestCombo.Value, Combo.Value); }; - Judgements = new List(hitObjectsNumber); + Judgements = new List(hitObjectCount); } public void AddJudgement(JudgementInfo judgement)