fix #94
This commit is contained in:
parent
b52b2b251c
commit
5989c50456
|
@ -124,8 +124,6 @@ public class Slider extends GameObject {
|
|||
|
||||
public int baseSliderFrom;
|
||||
|
||||
private boolean reversed;
|
||||
|
||||
/**
|
||||
* Initializes the Slider data type with images and dimensions.
|
||||
* @param container the game container
|
||||
|
|
|
@ -155,11 +155,13 @@ public abstract class Curve {
|
|||
else {
|
||||
if (renderState == null)
|
||||
renderState = new CurveRenderState(hitObject, curve);
|
||||
renderState.draw(color, borderColor, t1, t2); // TODO
|
||||
renderState.draw(color, borderColor, t1, t2);
|
||||
}
|
||||
}
|
||||
|
||||
public void splice(int from, int to) {
|
||||
if (renderState == null)
|
||||
renderState = new CurveRenderState(hitObject, curve);
|
||||
renderState.splice(from, to);
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue
Block a user