Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #94

Browse Source
This commit is contained in:
yugecin 2016-12-07 13:35:29 +01:00
parent b52b2b251c
commit 5989c50456
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/itdelatrisu/opsu/objects/Slider.java
View File

@ -124,8 +124,6 @@ public class Slider extends GameObject {
public int baseSliderFrom; public int baseSliderFrom;
private boolean reversed;
/** /**
* Initializes the Slider data type with images and dimensions. * Initializes the Slider data type with images and dimensions.
* @param container the game container * @param container the game container

4
src/itdelatrisu/opsu/objects/curves/Curve.java
View File

@ -155,11 +155,13 @@ public abstract class Curve {
else { else {
if (renderState == null) if (renderState == null)
renderState = new CurveRenderState(hitObject, curve); 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) { public void splice(int from, int to) {
if (renderState == null)
renderState = new CurveRenderState(hitObject, curve);
renderState.splice(from, to); renderState.splice(from, to);
} }

11
src/itdelatrisu/opsu/states/Game.java
View File

@ -329,6 +329,17 @@ public class Game extends BasicGameState {
objectIndex++; objectIndex++;
} }
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); Dancer.instance.setObjectIndex(objectIndex);
sbOverlay.updateIndex(objectIndex); sbOverlay.updateIndex(objectIndex);
lastReplayTime = beatmap.objects[objectIndex].getTime(); lastReplayTime = beatmap.objects[objectIndex].getTime();