diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-18 14:48:08 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-18 14:48:08 -0600 |
| commit | ae11fba0692dcdbf0fe6e4edb799f1bd100ddcf8 (patch) | |
| tree | 5dcf94a8e21b5e0c8d3f0e0e5be8f9c59f6af8dc /Source/Core | |
| parent | 07765aa6f0f84992fbb61e16025bd343821cc378 (diff) | |
[Android] Make joysticks less dumb from a configuration standpoint.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Android/ButtonManager.h | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.h b/Source/Core/DolphinWX/Src/Android/ButtonManager.h index 5a99bb092f..383e52f445 100644 --- a/Source/Core/DolphinWX/Src/Android/ButtonManager.h +++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.h @@ -28,25 +28,27 @@ namespace ButtonManager enum ButtonType { BUTTON_A = 0, - BUTTON_B, - BUTTON_START, - BUTTON_X, - BUTTON_Y, - BUTTON_Z, - BUTTON_UP, - BUTTON_DOWN, - BUTTON_LEFT, - BUTTON_RIGHT, - STICK_MAIN_UP, - STICK_MAIN_DOWN, - STICK_MAIN_LEFT, - STICK_MAIN_RIGHT, - STICK_C_UP, - STICK_C_DOWN, - STICK_C_LEFT, - STICK_C_RIGHT, - TRIGGER_L, - TRIGGER_R + BUTTON_B = 1, + BUTTON_START = 2, + BUTTON_X = 3, + BUTTON_Y = 4, + BUTTON_Z = 5, + BUTTON_UP = 6, + BUTTON_DOWN = 7, + BUTTON_LEFT = 8, + BUTTON_RIGHT = 9, + STICK_MAIN = 10, /* Used on Java Side */ + STICK_MAIN_UP = 11, + STICK_MAIN_DOWN = 12, + STICK_MAIN_LEFT = 13, + STICK_MAIN_RIGHT = 14, + STICK_C = 15, /* Used on Java Side */ + STICK_C_UP = 16, + STICK_C_DOWN = 17, + STICK_C_LEFT = 18, + STICK_C_RIGHT = 19, + TRIGGER_L = 20, + TRIGGER_R = 21, }; enum ButtonState { |