From 444c645da0b8075936f31b5f883363310e6e61fe Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Fri, 10 Mar 2017 13:02:50 +0900 Subject: [PATCH] General fixes. --- osu.Game/Modes/UI/HUDOverlay.cs | 4 ++-- osu.Game/Modes/UI/HealthDisplay.cs | 6 +++--- osu.Game/Modes/UI/StandardHUDOverlay.cs | 4 ++-- osu.Game/Modes/UI/StandardHealthDisplay.cs | 4 ++-- osu.Game/Screens/Play/Player.cs | 4 ++-- osu.Game/osu.Game.csproj | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/osu.Game/Modes/UI/HUDOverlay.cs b/osu.Game/Modes/UI/HUDOverlay.cs index 23c4690ace..9dbccffdbd 100644 --- a/osu.Game/Modes/UI/HUDOverlay.cs +++ b/osu.Game/Modes/UI/HUDOverlay.cs @@ -13,7 +13,7 @@ using System; namespace osu.Game.Modes.UI { - internal abstract class HUDOverlay : Container + internal abstract class HudOverlay : Container { public readonly KeyCounterCollection KeyCounter; public readonly ComboCounter ComboCounter; @@ -42,7 +42,7 @@ namespace osu.Game.Modes.UI AccuracyCounter?.Set(AccuracyCounter.Count - 0.01f); } - protected HUDOverlay(Ruleset ruleset) + protected HudOverlay(Ruleset ruleset) { RelativeSizeAxes = Axes.Both; diff --git a/osu.Game/Modes/UI/HealthDisplay.cs b/osu.Game/Modes/UI/HealthDisplay.cs index ddc4bcfaa6..b920dcd68a 100644 --- a/osu.Game/Modes/UI/HealthDisplay.cs +++ b/osu.Game/Modes/UI/HealthDisplay.cs @@ -14,11 +14,11 @@ namespace osu.Game.Modes.UI MaxValue = 1 }; - public HealthDisplay() + protected HealthDisplay() { - Current.ValueChanged += (s, e) => setHP((float)Current); + Current.ValueChanged += (s, e) => SetHP((float)Current); } - protected abstract void setHP(float value); + protected abstract void SetHP(float value); } } diff --git a/osu.Game/Modes/UI/StandardHUDOverlay.cs b/osu.Game/Modes/UI/StandardHUDOverlay.cs index 7bbe9a41f1..5d39d518d3 100644 --- a/osu.Game/Modes/UI/StandardHUDOverlay.cs +++ b/osu.Game/Modes/UI/StandardHUDOverlay.cs @@ -10,9 +10,9 @@ using osu.Game.Screens.Play; namespace osu.Game.Modes.UI { - internal class StandardHUDOverlay : HUDOverlay + internal class StandardHudOverlay : HudOverlay { - public StandardHUDOverlay(Ruleset ruleset) + public StandardHudOverlay(Ruleset ruleset) : base(ruleset) { } diff --git a/osu.Game/Modes/UI/StandardHealthDisplay.cs b/osu.Game/Modes/UI/StandardHealthDisplay.cs index 3357b93aed..11b0bcd0c0 100644 --- a/osu.Game/Modes/UI/StandardHealthDisplay.cs +++ b/osu.Game/Modes/UI/StandardHealthDisplay.cs @@ -14,7 +14,7 @@ using osu.Game.Graphics; namespace osu.Game.Modes.UI { - class StandardHealthDisplay : HealthDisplay + internal class StandardHealthDisplay : HealthDisplay { private Container fill; @@ -55,6 +55,6 @@ namespace osu.Game.Modes.UI }; } - protected override void setHP(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint); + protected override void SetHP(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint); } } diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 3119fd5d74..6a5f5f948e 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play private Bindable dimLevel; private SkipButton skipButton; - private HUDOverlay hudOverlay; + private HudOverlay hudOverlay; private PauseOverlay pauseOverlay; [BackgroundDependencyLoader] @@ -112,7 +112,7 @@ namespace osu.Game.Screens.Play ruleset = Ruleset.GetRuleset(Beatmap.PlayMode); - hudOverlay = new StandardHUDOverlay(ruleset); + hudOverlay = new StandardHudOverlay(ruleset); hudOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count)); pauseOverlay = new PauseOverlay diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 98a23ceec3..638f6e76c5 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -169,7 +169,7 @@ - + @@ -184,7 +184,7 @@ - +