RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makes HasFailed private set and removes alreadyFailed

This commit is contained in:
Jacob Odgård Tørring 2017-10-24 08:34:10 +02:00
parent 86419e0ded
commit 493fe1d621
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,20 +66,15 @@ public abstract class ScoreProcessor
/// </summary> /// </summary>
protected virtual bool HasCompleted => false; protected virtual bool HasCompleted => false;
/// <summary>
/// Whether the score is in a failed state.
/// </summary>
public virtual bool HasFailed => alreadyFailed;
/// <summary>
/// The conditions for failing
/// </summary>
protected virtual bool FailCondition => Health.Value == Health.MinValue;
/// <summary> /// <summary>
/// Whether this ScoreProcessor has already triggered the failed state. /// Whether this ScoreProcessor has already triggered the failed state.
/// </summary> /// </summary>
private bool alreadyFailed; public virtual bool HasFailed { get; private set; }
/// <summary>
/// The conditions for failing.
/// </summary>
protected virtual bool FailCondition => Health.Value == Health.MinValue;
protected ScoreProcessor() protected ScoreProcessor()
{ {
@ -115,7 +110,7 @@ protected virtual void Reset(bool storeResults)
Rank.Value = ScoreRank.X; Rank.Value = ScoreRank.X;
HighestCombo.Value = 0; HighestCombo.Value = 0;
alreadyFailed = false; HasFailed = false;
} }
/// <summary> /// <summary>
@ -126,11 +121,11 @@ protected virtual void Reset(bool storeResults)
/// </summary> /// </summary>
protected void UpdateFailed() protected void UpdateFailed()
{ {
if (alreadyFailed || !FailCondition) if (HasFailed || !FailCondition)
return; return;
if (Failed?.Invoke() != false) if (Failed?.Invoke() != false)
alreadyFailed = true; HasFailed = true;
} }
/// <summary> /// <summary>