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

44
src/itdelatrisu/opsu/Options.java
View File

@@ -719,7 +719,7 @@ public class Options {
*/
public static int getGameKeyLeft() {
if (keyLeft == Keyboard.KEY_NONE)
keyLeft = Input.KEY_Z;
setGameKeyLeft(Input.KEY_Z);
return keyLeft;
}
@@ -729,21 +729,39 @@ public class Options {
*/
public static int getGameKeyRight() {
if (keyRight == Keyboard.KEY_NONE)
keyRight = Input.KEY_X;
setGameKeyRight(Input.KEY_X);
return keyRight;
}
/**
* Sets the left game key.
* This will not be set to the same key as the right game key, nor to reserved keys like ESCAPE.
* @param key the keyboard key
* @return {@code true} if the key was set, {@code false} if it was rejected
*/
public static void setGameKeyLeft(int key) { keyLeft = key; }
public static boolean setGameKeyLeft(int key) {
if (key == keyRight && key != Keyboard.KEY_NONE)
return false;
if (!isValidClickKey(key))
return false;
keyLeft = key;
return true;
}
/**
* Sets the right game key.
* This will not be set to the same key as the left game key, nor to reserved keys like ESCAPE.
* @param key the keyboard key
* @return {@code true} if the key was set, {@code false} if it was rejected
*/
public static void setGameKeyRight(int key) { keyRight = key; }
public static boolean setGameKeyRight(int key) {
if (key == keyLeft && key != Keyboard.KEY_NONE)
return false;
if (!isValidClickKey(key))
return false;
keyRight = key;
return true;
}
/**
* Returns the beatmap directory.
@@ -831,6 +849,10 @@ public class Options {
return osu;
}
public static boolean isValidClickKey(int keyCode) {
return keyCode != Keyboard.KEY_ESCAPE;
}
/**
* Reads user options from the options file, if it exists.
*/
@@ -941,20 +963,10 @@ public class Options {
GameOption.DISABLE_SOUNDS.setValue(Boolean.parseBoolean(value));
break;
case "keyOsuLeft":
if ((value.length() == 1 && Character.isLetterOrDigit(value.charAt(0))) ||
(value.length() == 7 && value.startsWith("NUMPAD"))) {
i = Keyboard.getKeyIndex(value);
if (keyRight != i)
keyLeft = i;
}
setGameKeyLeft(Keyboard.getKeyIndex(value));
break;
case "keyOsuRight":
if ((value.length() == 1 && Character.isLetterOrDigit(value.charAt(0))) ||
(value.length() == 7 && value.startsWith("NUMPAD"))) {
i = Keyboard.getKeyIndex(value);
if (keyLeft != i)
keyRight = i;
}
setGameKeyRight(Keyboard.getKeyIndex(value));
break;
case "MouseDisableWheel":
GameOption.DISABLE_MOUSE_WHEEL.setValue(Boolean.parseBoolean(value));