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

CreateJudgementResult -> CreateResult

Browse Source
This commit is contained in:
smoogipoo
2018-08-06 11:07:41 +09:00
parent 754f3c8621
commit ab642b563f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -68,6 +68,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
private OsuInputManager osuActionInputManager; private OsuInputManager osuActionInputManager;
internal OsuInputManager OsuActionInputManager => osuActionInputManager ?? (osuActionInputManager = GetContainingInputManager() as OsuInputManager); internal OsuInputManager OsuActionInputManager => osuActionInputManager ?? (osuActionInputManager = GetContainingInputManager() as OsuInputManager);
protected override JudgementResult CreateJudgementResult(Judgement judgement) => new OsuJudgementResult(judgement); protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(judgement);
} }
} }

2
osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
View File

@ -87,6 +87,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
} }
} }
protected override JudgementResult CreateJudgementResult(Judgement judgement) => new OsuJudgementResult(judgement); protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(judgement);
} }
} }

6
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -95,10 +95,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
{ {
if (HitObject.Judgement != null) if (HitObject.Judgement != null)
{ {
Result = CreateJudgementResult(HitObject.Judgement); Result = CreateResult(HitObject.Judgement);
if (Result == null) if (Result == null)
throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateJudgementResult)}."); throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
} }
var samples = GetSamples().ToArray(); var samples = GetSamples().ToArray();
@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// Creates the <see cref="JudgementResult"/> that represents the scoring result for this <see cref="DrawableHitObject"/>. /// Creates the <see cref="JudgementResult"/> that represents the scoring result for this <see cref="DrawableHitObject"/>.
/// </summary> /// </summary>
/// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param> /// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param>
protected virtual JudgementResult CreateJudgementResult(Judgement judgement) => new JudgementResult(judgement); protected virtual JudgementResult CreateResult(Judgement judgement) => new JudgementResult(judgement);
} }
public abstract class DrawableHitObject<TObject> : DrawableHitObject public abstract class DrawableHitObject<TObject> : DrawableHitObject

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

@ -236,7 +236,7 @@ namespace osu.Game.Rulesets.Scoring
if (obj.Judgement == null) if (obj.Judgement == null)
return; return;
var result = CreateJudgementResult(obj.Judgement); var result = CreateResult(obj.Judgement);
result.Type = obj.Judgement.MaxResult; result.Type = obj.Judgement.MaxResult;
applyResult(result); applyResult(result);
@ -367,7 +367,7 @@ namespace osu.Game.Rulesets.Scoring
/// Creates the <see cref="JudgementResult"/> that represents the scoring result for a <see cref="HitObject"/>. /// Creates the <see cref="JudgementResult"/> that represents the scoring result for a <see cref="HitObject"/>.
/// </summary> /// </summary>
/// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param> /// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param>
protected virtual JudgementResult CreateJudgementResult(Judgement judgement) => new JudgementResult(judgement); protected virtual JudgementResult CreateResult(Judgement judgement) => new JudgementResult(judgement);
} }
public enum ScoringMode public enum ScoringMode