sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-10 12:49:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge UpdateFailed and CheckAlternateFailConditions

Browse Source
This commit is contained in:
smoogipoo
2017-11-21 17:11:07 +09:00
parent 1b27ce6198
commit 18b9828c49
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,10 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
protected void UpdateFailed() protected void UpdateFailed()
{ {
if (HasFailed || !DefaultFailCondition) if (HasFailed)
return;
if (!DefaultFailCondition && FailConditions?.Invoke(this) != true)
return; return;
if (Failed?.Invoke() != false) if (Failed?.Invoke() != false)
@ -145,18 +148,6 @@ namespace osu.Game.Rulesets.Scoring
AllJudged?.Invoke(); AllJudged?.Invoke();
} }
protected void CheckAlternateFailConditions()
{
if (HasFailed)
return;
if (FailConditions?.Invoke(this) == true)
{
if (Failed?.Invoke() != false)
HasFailed = true;
}
}
/// <summary> /// <summary>
/// Retrieve a score populated with data for the current play this processor is responsible for. /// Retrieve a score populated with data for the current play this processor is responsible for.
/// </summary> /// </summary>
@ -233,8 +224,6 @@ namespace osu.Game.Rulesets.Scoring
OnNewJudgement(judgement); OnNewJudgement(judgement);
updateScore(); updateScore();
CheckAlternateFailConditions();
NotifyNewJudgement(judgement); NotifyNewJudgement(judgement);
UpdateFailed(); UpdateFailed();
} }