From 604b0fa20abe871b1369a16ebc7258e2e4111fbc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Feb 2018 14:11:06 +0900
Subject: [PATCH] Fix post-merge issues

---
 .../Edit/Layers/Selection/Overlays/SliderOverlay.cs |  8 ++------
 .../Objects/Drawables/DrawableSlider.cs             | 13 -------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderOverlay.cs b/osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderOverlay.cs
index 0a9b5638ea..4de44a7ae1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderOverlay.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderOverlay.cs
@@ -16,13 +16,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Layers.Selection.Overlays
     {
         private readonly SliderBody body;
 
-        private readonly DrawableSlider hitObject;
-
         public SliderOverlay(DrawableSlider slider)
             : base(slider)
         {
-            hitObject = slider;
-
             var obj = (Slider)slider.HitObject;
 
             InternalChildren = new Drawable[]
@@ -48,8 +44,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Layers.Selection.Overlays
         {
             base.Update();
 
-            hitObject.GetCurrentProgress(out int span, out double progress);
-            body.UpdateProgress(progress, span);
+            // Need to cause one update
+            body.UpdateProgress(0);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 278f3d79f4..cc6f8ad34f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -157,19 +157,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        /// <summary>
-        /// Finds the progress along the slider at the current time.
-        /// </summary>
-        /// <param name="span">The current span.</param>
-        /// <param name="progress">The current progress in the current span.</param>
-        public void GetCurrentProgress(out int span, out double progress)
-        {
-            double offset = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
-
-            span = slider.SpanAt(offset);
-            progress = slider.ProgressAt(offset);
-        }
-
         public Drawable ProxiedLayer => HeadCircle.ApproachCircle;
 
         public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Body.ReceiveMouseInputAt(screenSpacePos);