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

hotfix broken slidermovers

Browse Source
This commit is contained in:
yugecin 2016-11-20 23:40:30 +01:00
parent 49d1d5dd2d
commit 6e4d34b3c5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/yugecin/opsudance/Dancer.java
View File

@ -25,6 +25,7 @@ import awlex.ospu.polymover.factory.PolyMoverFactory;
import awlex.ospu.spinners.SpiralSpinner; import awlex.ospu.spinners.SpiralSpinner;
import itdelatrisu.opsu.Options; import itdelatrisu.opsu.Options;
import itdelatrisu.opsu.Utils; import itdelatrisu.opsu.Utils;
import itdelatrisu.opsu.audio.MusicController;
import itdelatrisu.opsu.objects.Circle; import itdelatrisu.opsu.objects.Circle;
import itdelatrisu.opsu.objects.DummyObject; import itdelatrisu.opsu.objects.DummyObject;
import itdelatrisu.opsu.objects.GameObject; import itdelatrisu.opsu.objects.GameObject;
@ -189,7 +190,7 @@ public class Dancer {
p = e[0]; p = e[0];
c = e[1]; c = e[1];
} }
if (this.objectIndex != objectIndex) { if (this.objectIndex != objectIndex || c != gameObjects[objectIndex]) {
this.objectIndex = objectIndex; this.objectIndex = objectIndex;
if (objectIndex == 0) { if (objectIndex == 0) {
if (c.isSpinner()) { if (c.isSpinner()) {
@ -267,11 +268,18 @@ public class Dancer {
} }
return; return;
} }
GameObject p = null;
if (objectIndex > 0) {
p = gameObjects[objectIndex - 1];
GameObject[] e = sliderMoverController.process(p, c, MusicController.getPosition());
p = e[0];
c = e[1];
}
if (mover == null || mover.getEnd() != c) { if (mover == null || mover.getEnd() != c) {
if (objectIndex == 0) { if (objectIndex == 0) {
mover = new LinearMover(d, c, dir); mover = new LinearMover(d, c, dir);
} else { } else {
mover = moverFactory.create(gameObjects[objectIndex - 1], c, dir); mover = moverFactory.create(p, c, dir);
} }
} }
} }