Merge branch 'master' into replaystuff

This commit is contained in:
yugecin 2017-02-26 00:03:47 +01:00
commit 0e8bf0b31e

View File

@ -541,9 +541,9 @@ public class Game extends ComplexOpsuState {
} }
} }
} else if (breakLength >= 4000) { } else if (breakLength >= 4000) {
// show break end (flash four times for 250ms) // show break end (flash eight times for 125ms)
int endTimeDiff = endTime - trackPosition; int endTimeDiff = endTime - trackPosition;
if (endTimeDiff < 2000 && (endTimeDiff / 250 % 2) == 1) { if (endTimeDiff < 2000 && (endTimeDiff / 125 % 2) == 1) {
Image arrow = GameImage.WARNINGARROW.getImage(); Image arrow = GameImage.WARNINGARROW.getImage();
arrow.setRotation(0); arrow.setRotation(0);
arrow.draw(width * 0.15f, height * 0.15f); arrow.draw(width * 0.15f, height * 0.15f);