Fix post-merge issues

This commit is contained in:
smoogipoo
2018-02-22 14:11:06 +09:00
parent ded2644df8
commit 604b0fa20a
2 changed files with 2 additions and 19 deletions

View File

@ -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);