From 493fe1d621da5c7c67a98a84e702b6216bba8701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Odg=C3=A5rd=20T=C3=B8rring?= Date: Tue, 24 Oct 2017 08:34:10 +0200 Subject: [PATCH] Makes HasFailed private set and removes alreadyFailed --- osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 23 ++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index 934b19b511..5a54c679dd 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -66,20 +66,15 @@ public abstract class ScoreProcessor /// protected virtual bool HasCompleted => false; - /// - /// Whether the score is in a failed state. - /// - public virtual bool HasFailed => alreadyFailed; - - /// - /// The conditions for failing - /// - protected virtual bool FailCondition => Health.Value == Health.MinValue; - /// /// Whether this ScoreProcessor has already triggered the failed state. /// - private bool alreadyFailed; + public virtual bool HasFailed { get; private set; } + + /// + /// The conditions for failing. + /// + protected virtual bool FailCondition => Health.Value == Health.MinValue; protected ScoreProcessor() { @@ -115,7 +110,7 @@ protected virtual void Reset(bool storeResults) Rank.Value = ScoreRank.X; HighestCombo.Value = 0; - alreadyFailed = false; + HasFailed = false; } /// @@ -126,11 +121,11 @@ protected virtual void Reset(bool storeResults) /// protected void UpdateFailed() { - if (alreadyFailed || !FailCondition) + if (HasFailed || !FailCondition) return; if (Failed?.Invoke() != false) - alreadyFailed = true; + HasFailed = true; } ///