From 83863d35c3713f29b271bcf571c10789c4daf3b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Mar 2019 16:34:26 +0900
Subject: [PATCH] Remove AllowLeadIn flag

---
 osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs     | 1 -
 osu.Game.Tests/Visual/Gameplay/TestCaseAutoplay.cs     | 1 -
 osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs | 2 --
 osu.Game/Screens/Play/GameplayClockContainer.cs        | 6 ++----
 osu.Game/Screens/Play/Player.cs                        | 3 +--
 osu.Game/Tests/Visual/AllPlayersTestCase.cs            | 1 -
 osu.Game/Tests/Visual/PlayerTestCase.cs                | 1 -
 7 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs
index 2f33982d41..9614ece40e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs
@@ -333,7 +333,6 @@ namespace osu.Game.Rulesets.Osu.Tests
                 var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } })
                 {
                     AllowPause = false,
-                    AllowLeadIn = false,
                     AllowResults = false
                 };
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestCaseAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestCaseAutoplay.cs
index 2b0254f232..efb6dac158 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestCaseAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestCaseAutoplay.cs
@@ -18,7 +18,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             return new ScoreAccessiblePlayer
             {
                 AllowPause = false,
-                AllowLeadIn = false,
                 AllowResults = false,
             };
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs
index be2a21d23d..f571e85fe8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("load dummy beatmap", () => stack.Push(loader = new PlayerLoader(() => new Player
             {
                 AllowPause = false,
-                AllowLeadIn = false,
                 AllowResults = false,
             })));
 
@@ -50,7 +49,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 stack.Push(loader = new PlayerLoader(() => slow = new SlowLoadPlayer
                 {
                     AllowPause = false,
-                    AllowLeadIn = false,
                     AllowResults = false,
                 }));
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index deac5e02bf..6ceef1dd18 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock offsetClock;
 
-        public GameplayClockContainer(WorkingBeatmap beatmap, bool allowLeadIn, double gameplayStartTime)
+        public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime)
         {
             this.beatmap = beatmap;
 
@@ -64,9 +64,7 @@ namespace osu.Game.Screens.Play
 
             adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
 
-            adjustableClock.Seek(allowLeadIn
-                ? Math.Min(0, gameplayStartTime - beatmap.BeatmapInfo.AudioLeadIn)
-                : gameplayStartTime);
+            adjustableClock.Seek(Math.Min(0, gameplayStartTime - beatmap.BeatmapInfo.AudioLeadIn));
 
             adjustableClock.ProcessFrame();
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7b1cdd21a6..3ef8525b65 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Screens.Play
         public bool HasFailed { get; private set; }
 
         public bool AllowPause { get; set; } = true;
-        public bool AllowLeadIn { get; set; } = true;
         public bool AllowResults { get; set; } = true;
 
         private Bindable<bool> mouseWheelDisabled;
@@ -90,7 +89,7 @@ namespace osu.Game.Screens.Play
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 
-            InternalChild = GameplayClockContainer = new GameplayClockContainer(working, AllowLeadIn, DrawableRuleset.GameplayStartTime);
+            InternalChild = GameplayClockContainer = new GameplayClockContainer(working, DrawableRuleset.GameplayStartTime);
 
             GameplayClockContainer.Children = new[]
             {
diff --git a/osu.Game/Tests/Visual/AllPlayersTestCase.cs b/osu.Game/Tests/Visual/AllPlayersTestCase.cs
index 03bd7b218a..25c397857d 100644
--- a/osu.Game/Tests/Visual/AllPlayersTestCase.cs
+++ b/osu.Game/Tests/Visual/AllPlayersTestCase.cs
@@ -83,7 +83,6 @@ namespace osu.Game.Tests.Visual
         protected virtual Player CreatePlayer(Ruleset ruleset) => new Player
         {
             AllowPause = false,
-            AllowLeadIn = false,
             AllowResults = false,
         };
     }
diff --git a/osu.Game/Tests/Visual/PlayerTestCase.cs b/osu.Game/Tests/Visual/PlayerTestCase.cs
index 50cb839ed9..3be887910c 100644
--- a/osu.Game/Tests/Visual/PlayerTestCase.cs
+++ b/osu.Game/Tests/Visual/PlayerTestCase.cs
@@ -59,7 +59,6 @@ namespace osu.Game.Tests.Visual
         protected virtual Player CreatePlayer(Ruleset ruleset) => new Player
         {
             AllowPause = false,
-            AllowLeadIn = false,
             AllowResults = false,
         };
     }