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

Merge branch 'sb'

Browse Source
This commit is contained in:
yugecin 2016-12-12 00:16:16 +01:00
commit c11d8b3053
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1551,9 +1551,9 @@ public class Game extends BasicGameState {
Dancer.instance.setGameObjects(gameObjects); Dancer.instance.setGameObjects(gameObjects);
sbOverlay.setGameObjects(gameObjects); sbOverlay.setGameObjects(gameObjects);
sbOverlay.updateIndex(objectIndex);
if (!skippedToCheckpoint) { if (!skippedToCheckpoint) {
sbOverlay.enter(); sbOverlay.enter();
sbOverlay.updateIndex(0);
} }
Pippi.reset(); Pippi.reset();

6
src/yugecin/opsudance/ui/SBOverlay.java
View File

@ -198,18 +198,18 @@ public class SBOverlay implements OptionsOverlay.Parent {
} }
} else if (key == Input.KEY_J && index > 0) { } else if (key == Input.KEY_J && index > 0) {
index--; index--;
setMusicPosition();
goBackOneSBIndex(); goBackOneSBIndex();
setMusicPosition();
} else if (key == Input.KEY_K && index < gameObjects.length - 1) { } else if (key == Input.KEY_K && index < gameObjects.length - 1) {
index++; index++;
setMusicPosition();
updateIndex(index); updateIndex(index);
setMusicPosition();
} }
return false; return false;
} }
private void goBackOneSBIndex() { private void goBackOneSBIndex() {
if (index + 1 < optionsMap.length && optionsMap[index + 1] != null) { if (index + 1 < optionsMap.length) {
// new options on previous index, so to revert then we have to reload them all to this point.. // new options on previous index, so to revert then we have to reload them all to this point..
reloadSBsettingsToIndex(index); reloadSBsettingsToIndex(index);
} }