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

Merge pull request #31 from ScoreUnder/tweak-remove-key-restriction

Browse Source 
Remove restriction from left/right click keys
This commit is contained in:
Jeffrey Han
2015-03-07 14:10:28 -05:00
parent cf6e87f6f2 9271e0d473
commit 04cca79b46
2 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/itdelatrisu/opsu/states/OptionsMenu.java
View File

@@ -243,9 +243,17 @@ public class OptionsMenu extends BasicGameState {
g.setColor(Utils.COLOR_BLACK_ALPHA);
g.fillRect(0, 0, width, height);
g.setColor(Color.white);
String prompt;
if (keyEntryLeft) {
prompt = "Please press the new left-click key";
} else {
prompt = "Please press the new right-click key";
}
Utils.FONT_LARGE.drawString(
(width / 2) - (Utils.FONT_LARGE.getWidth("Please enter a letter or digit.") / 2),
(height / 2) - Utils.FONT_LARGE.getLineHeight(), "Please enter a letter or digit."
(width / 2) - (Utils.FONT_LARGE.getWidth(prompt) / 2),
(height / 2) - Utils.FONT_LARGE.getLineHeight(), prompt
);
}
@@ -339,12 +347,10 @@ public class OptionsMenu extends BasicGameState {
public void keyPressed(int key, char c) {
// key entry state
if (keyEntryLeft || keyEntryRight) {
if (Character.isLetterOrDigit(c)) {
if (keyEntryLeft && Options.getGameKeyRight() != key)
Options.setGameKeyLeft(key);
else if (keyEntryRight && Options.getGameKeyLeft() != key)
Options.setGameKeyRight(key);
}
if (keyEntryLeft)
Options.setGameKeyLeft(key);
else
Options.setGameKeyRight(key);
keyEntryLeft = keyEntryRight = false;
return;
}