diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-24 22:53:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 22:53:16 +0100 |
| commit | 5cad9147f9b1f96ba0fdc84f0a6112befdfdfc92 (patch) | |
| tree | 753e808402c6b11a2080a98112708147db152015 /core/global_constants.cpp | |
| parent | 60a9debb99ecb538ab91d76d80ab6f6c22cf4d5f (diff) | |
| parent | 0d8f5660f66d9952072fa62b88f620f7ea839d51 (diff) | |
| download | redot-engine-5cad9147f9b1f96ba0fdc84f0a6112befdfdfc92.tar.gz | |
Merge pull request #8133 from Hinsbart/joy_constants
Input: Refactor JOY_* constants.
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 9d1ae3aed9..02655993a4 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), |