diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-11-08 11:02:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 11:02:24 +0100 |
| commit | 30620434e1c4c99718cebefabec673c84e16689c (patch) | |
| tree | 06e75969d751f7a702c26c72f7f53ffc963973d6 | |
| parent | 09abcc719b9890c01535e5cc3818a3639739e501 (diff) | |
| parent | 2a230d571d0eb85bc6017a7e47a7f94ae54fc5cf (diff) | |
Merge pull request #12743 from BastiaanOlij/increase_joystick_maxaxis
Increase joystick axis from 8 to 10
| -rw-r--r-- | core/global_constants.cpp | 2 | ||||
| -rw-r--r-- | core/os/input_event.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp index 8bddeae69a..7854f342b0 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -435,6 +435,8 @@ void register_global_constants() { BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_5); BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_6); BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_7); + BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_8); + BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_9); BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_MAX); BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_LX); diff --git a/core/os/input_event.h b/core/os/input_event.h index f2c8cc802d..de3c0232ff 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -122,7 +122,9 @@ enum JoystickList { JOY_AXIS_5 = 5, JOY_AXIS_6 = 6, JOY_AXIS_7 = 7, - JOY_AXIS_MAX = 8, + JOY_AXIS_8 = 8, + JOY_AXIS_9 = 9, + JOY_AXIS_MAX = 10, JOY_ANALOG_LX = JOY_AXIS_0, JOY_ANALOG_LY = JOY_AXIS_1, |