From ecf8a89f26fadffd2c47eaae4e2c02334f6571cf Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 16 Nov 2018 19:30:58 +0300
Subject: [PATCH] Set AccentColour and GlowColour in StandardHealthDisplay

---
 osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs |  8 ++++++++
 osu.Game/Screens/Play/HUDOverlay.cs                | 10 +---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
index b551b1f7a6..850ab9f641 100644
--- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -92,6 +93,13 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.BlueLighter;
+            GlowColour = colours.BlueDarker;
+        }
+
         public void Flash(JudgementResult result)
         {
             if (result.Type == HitResult.Miss)
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index daf5b72ebd..beed14b293 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -9,7 +9,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -89,7 +88,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuConfigManager config, NotificationOverlay notificationOverlay, OsuColour colours)
+        private void load(OsuConfigManager config, NotificationOverlay notificationOverlay)
         {
             showHud = config.GetBindable<bool>(OsuSetting.ShowInterface);
             showHud.ValueChanged += hudVisibility => content.FadeTo(hudVisibility ? 1 : 0, duration);
@@ -104,13 +103,6 @@ namespace osu.Game.Screens.Play
                     Text = @"The score overlay is currently disabled. You can toggle this by pressing Shift+Tab."
                 });
             }
-
-            var shd = HealthDisplay as StandardHealthDisplay;
-            if (shd != null)
-            {
-                shd.AccentColour = colours.BlueLighter;
-                shd.GlowColour = colours.BlueDarker;
-            }
         }
 
         protected override void LoadComplete()