Fix combo colour normalisation setting not applying to editor test play

osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs

@@ -1,23 +1,25 @@
 // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Overlays;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Edit.GameplayTest
 {
-    public class EditorPlayer : Player
+    public class EditorPlayer : Player, IGameplaySettings
     {
         private readonly Editor editor;
         private readonly EditorState editorState;
 
         [Resolved]
-        private MusicController musicController { get; set; }
+        private MusicController musicController { get; set; } = null!;
+
+        private OsuConfigManager config = null!;
 
         public EditorPlayer(Editor editor)
             : base(new PlayerConfiguration { ShowResults = false })
@@ -26,6 +28,14 @@ public EditorPlayer(Editor editor)
             editorState = editor.GetState();
         }
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            // needs to be populated before BDL to work correctly.
+            config = parent.Get<OsuConfigManager>();
+
+            return base.CreateChildDependencies(parent);
+        }
+
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
             var masterGameplayClockContainer = new MasterGameplayClockContainer(beatmap, gameplayStart);
@@ -74,5 +84,9 @@ public override bool OnExiting(ScreenExitEvent e)
             editor.RestoreState(editorState);
             return base.OnExiting(e);
         }
+
+        // Editor overrides but we actually want to use game-wide settings here.
+        public IBindable<float> ComboColourNormalisationAmount => ((IGameplaySettings)config).ComboColourNormalisationAmount;
+        public IBindable<float> PositionalHitsoundsLevel => ((IGameplaySettings)config).PositionalHitsoundsLevel;
     }
 }