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

Move Schedule call to base implementation of error meter for extra safety

Browse Source
This commit is contained in:
Dean Herbert 2021-12-21 12:55:21 +09:00
parent 28d6ff5d9c
commit 52db7b36fc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
View File

@ -53,13 +53,13 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
LayoutEasing = Easing.OutQuint; LayoutEasing = Easing.OutQuint;
} }
public void Push(Color4 colour) => Schedule(() => public void Push(Color4 colour)
{ {
Add(new HitErrorCircle(colour, drawable_judgement_size)); Add(new HitErrorCircle(colour, drawable_judgement_size));
if (Children.Count > max_available_judgements) if (Children.Count > max_available_judgements)
Children.FirstOrDefault(c => !c.IsRemoved)?.Remove(); Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
}); }
} }
internal class HitErrorCircle : Container internal class HitErrorCircle : Container

7
osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
View File

@ -40,9 +40,14 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
if (gameplayClockContainer != null) if (gameplayClockContainer != null)
gameplayClockContainer.OnSeek += Clear; gameplayClockContainer.OnSeek += Clear;
processor.NewJudgement += OnNewJudgement; // Scheduled as meter implementations are likely going to change/add drawables when reacting to this.
processor.NewJudgement += j => Schedule(() => OnNewJudgement(j));
} }
/// <summary>
/// Fired when a new judgement arrives.
/// </summary>
/// <param name="judgement">The new judgement.</param>
protected abstract void OnNewJudgement(JudgementResult judgement); protected abstract void OnNewJudgement(JudgementResult judgement);
protected Color4 GetColourForHitResult(HitResult result) protected Color4 GetColourForHitResult(HitResult result)