From d5296d51fafec52756820bf311253f29ffef1a91 Mon Sep 17 00:00:00 2001 From: yugecin Date: Mon, 5 Dec 2016 00:35:11 +0100 Subject: [PATCH] fix shrinking sliders for fallback sliders --- src/itdelatrisu/opsu/objects/Slider.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java index cb893ea4..733d2f63 100644 --- a/src/itdelatrisu/opsu/objects/Slider.java +++ b/src/itdelatrisu/opsu/objects/Slider.java @@ -416,14 +416,18 @@ public class Slider extends GameObject { } game.setSlidercurveTo(baseSliderFrom + (int) (curveIntervalTo * curve.getCurvePoints().length)); } else { - if (Options.isShrinkingSliders() && curveIntervalFrom > 0) { - int curvelen = curve.getCurvePoints().length; - if (repeats % 2 == 0) { - curve.splice((int) ((1f - curveIntervalFrom) * curvelen), curvelen); - curveIntervalFrom = 0f; + if (Options.isFallbackSliders() && curveIntervalFrom > 0 && repeats % 2 == 0) { + curve.draw(curveColor, 1f - curveIntervalTo, 1f - curveIntervalFrom); + } else { + if (Options.isShrinkingSliders() && curveIntervalFrom > 0 && !Options.isFallbackSliders()) { + int curvelen = curve.getCurvePoints().length; + if (repeats % 2 == 0) { + curve.splice((int) ((1f - curveIntervalFrom) * curvelen), curvelen); + curveIntervalFrom = 0f; + } } + curve.draw(curveColor, curveIntervalFrom, curveIntervalTo); } - curve.draw(curveColor, curveIntervalFrom, curveIntervalTo); } return curveIntervalTo == 1f; }