Follow-up to #38: loop tracks on states by default.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-03-07 19:04:45 -05:00
parent 447fd93e60
commit 8c24ef97c7
10 changed files with 26 additions and 15 deletions

View File

@@ -460,6 +460,7 @@ public class SongMenu extends BasicGameState {
public void update(GameContainer container, StateBasedGame game, int delta)
throws SlickException {
UI.update(delta);
MusicController.loopTrackIfEnded(true);
int mouseX = input.getMouseX(), mouseY = input.getMouseY();
UI.getBackButton().hoverUpdate(delta, mouseX, mouseY);
selectModsButton.hoverUpdate(delta, mouseX, mouseY);
@@ -566,10 +567,6 @@ public class SongMenu extends BasicGameState {
hoverOffset = 0f;
hoverIndex = -1;
}
if (MusicController.trackEnded()) {
OsuFile osu = focusNode.osuFiles.get(focusNode.osuFileIndex);
MusicController.play(osu, false, true, true);
}
}
@Override
@@ -1167,7 +1164,7 @@ public class SongMenu extends BasicGameState {
startNode = node;
focusNode = OsuGroupList.get().getNode(node, osuFileIndex);
OsuFile osu = focusNode.osuFiles.get(focusNode.osuFileIndex);
MusicController.play(osu, false, preview, false);
MusicController.play(osu, false, preview);
Utils.loadGlyphs(osu);
// load scores