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

More quick fixes.

Browse Source 
- Minor typo in ErrorHandler.
- Prevent more than one music control button in the main menu from being hovered over at once.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-01-17 00:44:23 -05:00
parent f5df00255f
commit d92e67e5f1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/itdelatrisu/opsu/ErrorHandler.java
View File

@ -131,7 +131,7 @@ public class ErrorHandler {
// don't report the error // don't report the error
int n = JOptionPane.showOptionDialog(null, message, title, int n = JOptionPane.showOptionDialog(null, message, title,
JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE, JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE,
null, options, optionsR[1]); null, options, options[1]);
if (n == 0) if (n == 0)
Desktop.getDesktop().open(Options.LOG_FILE); Desktop.getDesktop().open(Options.LOG_FILE);
} }

10
src/itdelatrisu/opsu/states/MainMenu.java
View File

@ -246,12 +246,14 @@ public class MainMenu extends BasicGameState {
logo.hoverUpdate(delta, mouseX, mouseY); logo.hoverUpdate(delta, mouseX, mouseY);
playButton.hoverUpdate(delta, mouseX, mouseY); playButton.hoverUpdate(delta, mouseX, mouseY);
exitButton.hoverUpdate(delta, mouseX, mouseY); exitButton.hoverUpdate(delta, mouseX, mouseY);
musicPlay.hoverUpdate(delta, mouseX, mouseY);
musicPause.hoverUpdate(delta, mouseX, mouseY);
musicNext.hoverUpdate(delta, mouseX, mouseY);
musicPrevious.hoverUpdate(delta, mouseX, mouseY);
if (repoButton != null) if (repoButton != null)
repoButton.hoverUpdate(delta, mouseX, mouseY); repoButton.hoverUpdate(delta, mouseX, mouseY);
musicPlay.hoverUpdate(delta, mouseX, mouseY);
musicPause.hoverUpdate(delta, mouseX, mouseY);
if (musicPlay.contains(mouseX, mouseY))
mouseX = mouseY = -1; // ensure only one button is in hover state at once
musicNext.hoverUpdate(delta, mouseX, mouseY);
musicPrevious.hoverUpdate(delta, mouseX, mouseY);
// window focus change: increase/decrease theme song volume // window focus change: increase/decrease theme song volume
if (MusicController.isThemePlaying() && if (MusicController.isThemePlaying() &&