From a2fbcb2bd39e756503d6e98a9cf25fb57dba021e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 May 2019 15:58:46 +0900
Subject: [PATCH] Fix rebase regressions

---
 osu.Game.Tests/Visual/Gameplay/TestCaseLeadIn.cs | 14 ++++++++------
 osu.Game/Screens/Play/GameplayClockContainer.cs  |  6 ------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestCaseLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestCaseLeadIn.cs
index 0186ba1da1..33f1e4062f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestCaseLeadIn.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestCaseLeadIn.cs
@@ -15,7 +15,7 @@
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCaseLeadIn : RateAdjustedBeatmapTestCase
+    public class TestCaseLeadIn : RateAdjustedBeatmapTestScene
     {
         private Ruleset ruleset;
 
@@ -52,15 +52,16 @@ private void loadPlayerWithBeatmap(IBeatmap beatmap)
         {
             Beatmap.Value = new TestWorkingBeatmap(beatmap, Clock);
 
-            LoadScreen(player = new LeadInPlayer
-            {
-                AllowPause = false,
-                AllowResults = false,
-            });
+            LoadScreen(player = new LeadInPlayer());
         }
 
         private class LeadInPlayer : Player
         {
+            public LeadInPlayer()
+                : base(false, false)
+            {
+            }
+
             public double? FirstFrameClockTime;
 
             public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
@@ -72,6 +73,7 @@ private class LeadInPlayer : Player
             protected override void UpdateAfterChildren()
             {
                 base.UpdateAfterChildren();
+
                 if (!FirstFrameClockTime.HasValue)
                 {
                     FirstFrameClockTime = GameplayClockContainer.GameplayClock.CurrentTime;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 7abdc8ef66..d718424b29 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -26,10 +26,6 @@ public class GameplayClockContainer : Container
         private readonly WorkingBeatmap beatmap;
         private readonly IReadOnlyList<Mod> mods;
 
-        private readonly bool allowLeadIn;
-
-        private readonly double gameplayStartTime;
-
         /// <summary>
         /// The original source (usually a <see cref="WorkingBeatmap"/>'s track).
         /// </summary>
@@ -91,8 +87,6 @@ public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, d
             GameplayClock.IsPaused.BindTo(IsPaused);
         }
 
-        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {