h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 08:13:10 +08:00
Code Issues Releases Wiki Activity

Privatise OnJudgements as much as possible

Browse Source
This commit is contained in:
smoogipoo 2018-01-16 15:37:32 +09:00
parent 976f7cec39
commit c309cc9454
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Catch.UI
public override void Add(DrawableHitObject h) public override void Add(DrawableHitObject h)
{ {
h.Depth = (float)h.HitObject.StartTime; h.Depth = (float)h.HitObject.StartTime;
h.OnJudgement += OnJudgement; h.OnJudgement += onJudgement;
base.Add(h); base.Add(h);
@ -66,6 +66,6 @@ namespace osu.Game.Rulesets.Catch.UI
fruit.CheckPosition = CheckIfWeCanCatch; fruit.CheckPosition = CheckIfWeCanCatch;
} }
public void OnJudgement(DrawableHitObject judgedObject, Judgement judgement) => catcherArea.OnJudgement((DrawableCatchHitObject)judgedObject, judgement); private void onJudgement(DrawableHitObject judgedObject, Judgement judgement) => catcherArea.OnJudgement((DrawableCatchHitObject)judgedObject, judgement);
} }
} }

4
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -205,12 +205,12 @@ namespace osu.Game.Rulesets.Mania.UI
{ {
hitObject.Depth = (float)hitObject.HitObject.StartTime; hitObject.Depth = (float)hitObject.HitObject.StartTime;
hitObject.AccentColour = AccentColour; hitObject.AccentColour = AccentColour;
hitObject.OnJudgement += OnJudgement; hitObject.OnJudgement += onJudgement;
HitObjects.Add(hitObject); HitObjects.Add(hitObject);
} }
public void OnJudgement(DrawableHitObject judgedObject, Judgement judgement) private void onJudgement(DrawableHitObject judgedObject, Judgement judgement)
{ {
if (!judgement.IsHit) if (!judgement.IsHit)
return; return;

2
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Mania.UI
} }
} }
public void OnJudgement(DrawableHitObject judgedObject, Judgement judgement) internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
{ {
judgements.Clear(); judgements.Clear();
judgements.Add(new DrawableManiaJudgement(judgement) judgements.Add(new DrawableManiaJudgement(judgement)

4
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.UI
{ {
h.Depth = (float)h.HitObject.StartTime; h.Depth = (float)h.HitObject.StartTime;
h.OnJudgement += OnJudgement; h.OnJudgement += onJudgement;
var c = h as IDrawableHitObjectWithProxiedApproach; var c = h as IDrawableHitObjectWithProxiedApproach;
if (c != null && ProxyApproachCircles) if (c != null && ProxyApproachCircles)
@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Osu.UI
.OrderBy(h => h.StartTime).OfType<OsuHitObject>(); .OrderBy(h => h.StartTime).OfType<OsuHitObject>();
} }
public void OnJudgement(DrawableHitObject judgedObject, Judgement judgement) private void onJudgement(DrawableHitObject judgedObject, Judgement judgement)
{ {
var osuJudgement = (OsuJudgement)judgement; var osuJudgement = (OsuJudgement)judgement;
var osuObject = (OsuHitObject)judgedObject.HitObject; var osuObject = (OsuHitObject)judgedObject.HitObject;

2
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Taiko.UI
swell.OnStart += () => topLevelHitContainer.Add(swell.CreateProxy()); swell.OnStart += () => topLevelHitContainer.Add(swell.CreateProxy());
} }
public void OnJudgement(DrawableHitObject judgedObject, Judgement judgement) internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
{ {
if (judgedObject.DisplayJudgement && judgementContainer.FirstOrDefault(j => j.JudgedObject == judgedObject) == null) if (judgedObject.DisplayJudgement && judgementContainer.FirstOrDefault(j => j.JudgedObject == judgedObject) == null)
{ {