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

Follow-up to #148: keypress and edge case fixes.

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-11-16 16:05:20 -05:00
parent af0d3b8c56
commit f835a441c2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/itdelatrisu/opsu/states/GamePauseMenu.java
View File

@ -50,6 +50,10 @@ public class GamePauseMenu extends BasicGameState {
/** Music fade-out time, in milliseconds. */ /** Music fade-out time, in milliseconds. */
private static final int FADEOUT_TIME = 2000; private static final int FADEOUT_TIME = 2000;
/** Additional delay time to block state changes during music fade-out, in milliseconds.
This prevents music playback issues when the track hasn't completely finished fading out. */
private static final int FADEOUT_EXTRA_DELAY = 100;
/** Track position when the pause menu was loaded (for FADEOUT_TIME). */ /** Track position when the pause menu was loaded (for FADEOUT_TIME). */
private long pauseStartTime; private long pauseStartTime;
@ -125,10 +129,16 @@ public class GamePauseMenu extends BasicGameState {
mousePressed(Input.MOUSE_RIGHT_BUTTON, input.getMouseX(), input.getMouseY()); mousePressed(Input.MOUSE_RIGHT_BUTTON, input.getMouseX(), input.getMouseY());
} }
// if music faded out (i.e. health is zero), don't process any state changes before FADEOUT_TIME
boolean loseState = (gameState.getRestart() == Game.Restart.LOSE);
boolean loseBlockDelay = (loseState && System.currentTimeMillis() - pauseStartTime < FADEOUT_TIME + FADEOUT_EXTRA_DELAY);
switch (key) { switch (key) {
case Input.KEY_ESCAPE: case Input.KEY_ESCAPE:
if (loseBlockDelay)
break;
// 'esc' will normally unpause, but will return to song menu if health is zero // 'esc' will normally unpause, but will return to song menu if health is zero
if (gameState.getRestart() == Game.Restart.LOSE) { if (loseState) {
SoundController.playSound(SoundEffect.MENUBACK); SoundController.playSound(SoundEffect.MENUBACK);
((SongMenu) game.getState(Opsu.STATE_SONGMENU)).resetGameDataOnLoad(); ((SongMenu) game.getState(Opsu.STATE_SONGMENU)).resetGameDataOnLoad();
MusicController.playAt(MusicController.getBeatmap().previewTime, true); MusicController.playAt(MusicController.getBeatmap().previewTime, true);
@ -142,6 +152,8 @@ public class GamePauseMenu extends BasicGameState {
} }
break; break;
case Input.KEY_R: case Input.KEY_R:
if (loseBlockDelay)
break;
// restart // restart
if (input.isKeyDown(Input.KEY_RCONTROL) || input.isKeyDown(Input.KEY_LCONTROL)) { if (input.isKeyDown(Input.KEY_RCONTROL) || input.isKeyDown(Input.KEY_LCONTROL)) {
gameState.setRestart(Game.Restart.MANUAL); gameState.setRestart(Game.Restart.MANUAL);
@ -168,7 +180,7 @@ public class GamePauseMenu extends BasicGameState {
boolean loseState = (gameState.getRestart() == Game.Restart.LOSE); boolean loseState = (gameState.getRestart() == Game.Restart.LOSE);
// if music faded out (i.e. health is zero), don't process any actions before FADEOUT_TIME // if music faded out (i.e. health is zero), don't process any actions before FADEOUT_TIME
if (loseState && System.currentTimeMillis() - pauseStartTime < FADEOUT_TIME) if (loseState && System.currentTimeMillis() - pauseStartTime < FADEOUT_TIME + FADEOUT_EXTRA_DELAY)
return; return;
if (continueButton.contains(x, y) && !loseState) { if (continueButton.contains(x, y) && !loseState) {