diff options
| author | Andreas Haas <liu.gam3@gmail.com> | 2017-03-24 17:33:52 +0100 |
|---|---|---|
| committer | Andreas Haas <liu.gam3@gmail.com> | 2017-03-24 18:04:36 +0100 |
| commit | 0d8f5660f66d9952072fa62b88f620f7ea839d51 (patch) | |
| tree | e9c4ae42a2e913ccab8a21d4ff2c34f23f4ad7b0 /core/global_constants.cpp | |
| parent | efaeebab4d83e5657288b7b20db6ce4ccf987a01 (diff) | |
Input: Refactor JOY_* constants.
**Breaking change**
Removed the `JOY_SNES_*` and `JOY_SEGA_*` constants. Imho there's no reason for a modern game engine to provide button aliases for decades-old hardware.
Also renamed `JOY_ANALOG_{0,1}_{X,Y}` to `JOY_ANALOG_{L,R}{X,Y}` and removed `JOY_ANALOG_2_*`.
Diffstat (limited to 'core/global_constants.cpp')
| -rw-r--r-- | core/global_constants.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp index c7f353ac44..92017e82b0 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -349,21 +349,11 @@ static _GlobalConstant _global_constants[] = { BIND_GLOBAL_CONSTANT(JOY_BUTTON_15), BIND_GLOBAL_CONSTANT(JOY_BUTTON_MAX), - BIND_GLOBAL_CONSTANT(JOY_SNES_A), - BIND_GLOBAL_CONSTANT(JOY_SNES_B), - BIND_GLOBAL_CONSTANT(JOY_SNES_X), - BIND_GLOBAL_CONSTANT(JOY_SNES_Y), - BIND_GLOBAL_CONSTANT(JOY_SONY_CIRCLE), BIND_GLOBAL_CONSTANT(JOY_SONY_X), BIND_GLOBAL_CONSTANT(JOY_SONY_SQUARE), BIND_GLOBAL_CONSTANT(JOY_SONY_TRIANGLE), - BIND_GLOBAL_CONSTANT(JOY_SEGA_B), - BIND_GLOBAL_CONSTANT(JOY_SEGA_A), - BIND_GLOBAL_CONSTANT(JOY_SEGA_X), - BIND_GLOBAL_CONSTANT(JOY_SEGA_Y), - BIND_GLOBAL_CONSTANT(JOY_XBOX_B), BIND_GLOBAL_CONSTANT(JOY_XBOX_A), BIND_GLOBAL_CONSTANT(JOY_XBOX_X), @@ -397,14 +387,11 @@ static _GlobalConstant _global_constants[] = { BIND_GLOBAL_CONSTANT(JOY_AXIS_7), BIND_GLOBAL_CONSTANT(JOY_AXIS_MAX), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_0_X), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_0_Y), - - BIND_GLOBAL_CONSTANT(JOY_ANALOG_1_X), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_1_Y), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_LX), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_LY), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_2_X), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_2_Y), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_RX), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_RY), BIND_GLOBAL_CONSTANT(JOY_ANALOG_L2), BIND_GLOBAL_CONSTANT(JOY_ANALOG_R2), |