sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improve safety of bindings in HealthDisplay

Browse Source
This commit is contained in:
Dean Herbert
2021-05-12 12:53:30 +09:00
parent 8e226319e2
commit 184dbaf202
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Screens/Play/HUD/HealthDisplay.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.HUD
/// </summary> /// </summary>
public abstract class HealthDisplay : Container public abstract class HealthDisplay : Container
{ {
private Bindable<bool> showHealthbar; private readonly Bindable<bool> showHealthbar = new Bindable<bool>(true);
[Resolved] [Resolved]
protected HealthProcessor HealthProcessor { get; private set; } protected HealthProcessor HealthProcessor { get; private set; }
@ -32,19 +32,22 @@ namespace osu.Game.Screens.Play.HUD
{ {
} }
[BackgroundDependencyLoader(true)] [Resolved(canBeNull: true)]
private void load(HUDOverlay hud) private HUDOverlay hudOverlay { get; set; }
{
Current.BindTo(HealthProcessor.Health);
protected override void LoadComplete()
{
base.LoadComplete();
Current.BindTo(HealthProcessor.Health);
HealthProcessor.NewJudgement += onNewJudgement; HealthProcessor.NewJudgement += onNewJudgement;
if (hud != null) if (hudOverlay != null)
{ showHealthbar.BindTo(hudOverlay.ShowHealthbar);
showHealthbar = hud.ShowHealthbar.GetBoundCopy();
// this probably shouldn't be operating on `this.`
showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true); showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
} }
}
private void onNewJudgement(JudgementResult judgement) private void onNewJudgement(JudgementResult judgement)
{ {