From 68e0b6fad8ced78eaf0eec5d81f21bc37bb0474c Mon Sep 17 00:00:00 2001 From: yugecin Date: Sat, 4 Mar 2017 00:27:53 +0100 Subject: [PATCH] better workaround for #130 --- src/itdelatrisu/opsu/GameData.java | 3 +-- src/itdelatrisu/opsu/states/Game.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java index 3edda7bb..25cbef40 100644 --- a/src/itdelatrisu/opsu/GameData.java +++ b/src/itdelatrisu/opsu/GameData.java @@ -972,8 +972,7 @@ public class GameData { float oldWhiteAlpha = Colors.WHITE_FADE.a; float oldColorAlpha = hitResult.color.a; Colors.WHITE_FADE.a = hitResult.color.a = alpha; - if (!Options.isMergingSliders()) // #issue-130 - hitResult.curve.draw(hitResult.color, Options.isMergingSliders() ? 1 : 0, hitResult.curve.getCurvePoints().length); + hitResult.curve.draw(hitResult.color, Options.isMergingSliders() ? 1 : 0, hitResult.curve.getCurvePoints().length); Colors.WHITE_FADE.a = oldWhiteAlpha; hitResult.color.a = oldColorAlpha; } diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java index a7a7bb41..99d2ff69 100644 --- a/src/itdelatrisu/opsu/states/Game.java +++ b/src/itdelatrisu/opsu/states/Game.java @@ -1653,6 +1653,9 @@ public class Game extends ComplexOpsuState { SoundController.mute(false); if (Options.isMergingSliders()) { + if (!Options.isShrinkingSliders()) { + knorkesliders = null; // workaround for issue-130 + } if (knorkesliders == null) { // let's create knorkesliders List curvepoints = new ArrayList<>();