fix #94

2016-12-07 13:35:29 +01:00
parent b52b2b251c
commit 5989c50456
3 changed files with 14 additions and 3 deletions
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -329,6 +329,17 @@ public class Game extends BasicGameState {
 				objectIndex++;
 			}
 			objectIndex--;
+			if (Options.isMergingSliders()) {
+				int obj = objectIndex;
+				while (obj < gameObjects.length) {
+					if (gameObjects[obj] instanceof Slider) {
+						slidercurveFrom = slidercurveTo = (float) ((Slider) gameObjects[obj]).baseSliderFrom / knorkesliders.getCurvePoints().length;
+						break;
+					}
+					obj++;
+				}
+				spliceSliderCurve(-1, -1);
+			}
 			Dancer.instance.setObjectIndex(objectIndex);
 			sbOverlay.updateIndex(objectIndex);
 			lastReplayTime = beatmap.objects[objectIndex].getTime();