diff options
Diffstat (limited to 'core/global_constants.cpp')
| -rw-r--r-- | core/global_constants.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp index c7f353ac44..9bc98c5ad7 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -6,6 +6,7 @@ /* http://www.godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -349,21 +350,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 +388,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), @@ -414,7 +402,7 @@ static _GlobalConstant _global_constants[] = { BIND_GLOBAL_CONSTANT(OK), BIND_GLOBAL_CONSTANT(FAILED), ///< Generic fail error BIND_GLOBAL_CONSTANT(ERR_UNAVAILABLE), ///< What is requested is unsupported/unavailable - BIND_GLOBAL_CONSTANT(ERR_UNCONFIGURED), ///< The object being used hasnt been properly set up yet + BIND_GLOBAL_CONSTANT(ERR_UNCONFIGURED), ///< The object being used hasn't been properly set up yet BIND_GLOBAL_CONSTANT(ERR_UNAUTHORIZED), ///< Missing credentials for requested resource BIND_GLOBAL_CONSTANT(ERR_PARAMETER_RANGE_ERROR), ///< Parameter given out of range BIND_GLOBAL_CONSTANT(ERR_OUT_OF_MEMORY), ///< Out of memory |