From cd8c9393f3205a69c367545742f7c47e48f82219 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 18 Jan 2017 11:08:16 +0800 Subject: [PATCH] HP -> Health --- osu.Game/Modes/UI/{HPDisplay.cs => HealthDisplay.cs} | 4 ++-- osu.Game/Modes/UI/ScoreOverlay.cs | 8 ++++---- osu.Game/osu.Game.csproj | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename osu.Game/Modes/UI/{HPDisplay.cs => HealthDisplay.cs} (89%) diff --git a/osu.Game/Modes/UI/HPDisplay.cs b/osu.Game/Modes/UI/HealthDisplay.cs similarity index 89% rename from osu.Game/Modes/UI/HPDisplay.cs rename to osu.Game/Modes/UI/HealthDisplay.cs index 316d8c40d2..0645d54b50 100644 --- a/osu.Game/Modes/UI/HPDisplay.cs +++ b/osu.Game/Modes/UI/HealthDisplay.cs @@ -9,12 +9,12 @@ using System; namespace osu.Game.Modes.UI { - public class HPDisplay : Container + public class HealthDisplay : Container { private Box background; private Box fill; - public HPDisplay() + public HealthDisplay() { Children = new Drawable[] { diff --git a/osu.Game/Modes/UI/ScoreOverlay.cs b/osu.Game/Modes/UI/ScoreOverlay.cs index 69b1119264..fbdd75b97d 100644 --- a/osu.Game/Modes/UI/ScoreOverlay.cs +++ b/osu.Game/Modes/UI/ScoreOverlay.cs @@ -17,14 +17,14 @@ namespace osu.Game.Modes.UI public ComboCounter ComboCounter; public ScoreCounter ScoreCounter; public PercentageCounter AccuracyCounter; - public HPDisplay HPDisplay; + public HealthDisplay HealthDisplay; public Score Score { get; set; } protected abstract KeyCounterCollection CreateKeyCounter(); protected abstract ComboCounter CreateComboCounter(); protected abstract PercentageCounter CreateAccuracyCounter(); protected abstract ScoreCounter CreateScoreCounter(); - protected virtual HPDisplay CreateHPDisplay() => new HPDisplay + protected virtual HealthDisplay CreateHealthDisplay() => new HealthDisplay { Size = new Vector2(0.5f, 20), RelativeSizeAxes = Axes.X, @@ -53,7 +53,7 @@ namespace osu.Game.Modes.UI ComboCounter = CreateComboCounter(), ScoreCounter = CreateScoreCounter(), AccuracyCounter = CreateAccuracyCounter(), - HPDisplay = CreateHPDisplay(), + HealthDisplay = CreateHealthDisplay(), }; } @@ -63,7 +63,7 @@ namespace osu.Game.Modes.UI processor.TotalScore.ValueChanged += delegate { ScoreCounter?.Set((ulong)processor.TotalScore.Value); }; processor.Accuracy.ValueChanged += delegate { AccuracyCounter?.Set((float)processor.Accuracy.Value); }; processor.Combo.ValueChanged += delegate { ComboCounter?.Set((ulong)processor.Combo.Value); }; - processor.Health.ValueChanged += delegate { HPDisplay?.Set(processor.Health.Value); }; + processor.Health.ValueChanged += delegate { HealthDisplay?.Set(processor.Health.Value); }; } } } diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index d1be695e15..8843bcf219 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -70,7 +70,7 @@ - +