merge the movers into one list, use java8 for default impl in interfaces
This commit is contained in:
@@ -424,11 +424,7 @@ public class Game extends BasicGameState {
|
||||
autoMousePressed = false;
|
||||
if (GameMod.AUTO.isActive() || GameMod.AUTOPILOT.isActive()) {
|
||||
Vec2f autoPoint;
|
||||
int lastObjectForDancer = beatmap.objects.length;
|
||||
if (Dancer.multipoint) {
|
||||
lastObjectForDancer -= Dancer.polyMoverFactories[Dancer.instance.getPolyMoverFactoryIndex()].getMinBufferSize();
|
||||
}
|
||||
if (objectIndex < lastObjectForDancer) {
|
||||
if (objectIndex < beatmap.objects.length - Dancer.instance.getPolyMoverFactoryMinBufferSize()) {
|
||||
Dancer d = Dancer.instance;
|
||||
d.update(trackPosition, objectIndex);
|
||||
autoPoint = new Vec2f(d.x, d.y);
|
||||
|
||||
@@ -112,7 +112,6 @@ public class OptionsMenu extends BasicGameState {
|
||||
GameOption.ENABLE_WATCH_SERVICE
|
||||
}),
|
||||
DANCE ("Dance", new GameOption[] {
|
||||
GameOption.DANCE_MOVER_TYPE,
|
||||
GameOption.DANCE_MOVER,
|
||||
GameOption.DANCE_MOVER_DIRECTION,
|
||||
GameOption.DANCE_SLIDER_MOVER_TYPE,
|
||||
|
||||
Reference in New Issue
Block a user