godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed out of bounds axis name access

Browse Source
This commit is contained in:
Wilson E. Alvarez 2019-01-04 19:31:52 -05:00
parent 5e6c6f3bb7
commit caf5e92121
No known key found for this signature in database
GPG Key ID: A32174A3D2ED3F9E
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/input_default.cpp
View File

@ -1084,7 +1084,7 @@ Array InputDefault::get_connected_joypads() {
return ret; return ret;
} }
static const char *_buttons[] = { static const char *_buttons[JOY_BUTTON_MAX] = {
"Face Button Bottom", "Face Button Bottom",
"Face Button Right", "Face Button Right",
"Face Button Left", "Face Button Left",
@ -1103,7 +1103,7 @@ static const char *_buttons[] = {
"DPAD Right" "DPAD Right"
}; };
static const char *_axes[] = { static const char *_axes[JOY_AXIS_MAX] = {
"Left Stick X", "Left Stick X",
"Left Stick Y", "Left Stick Y",
"Right Stick X", "Right Stick X",
@ -1111,7 +1111,9 @@ static const char *_axes[] = {
"", "",
"", "",
"L2", "L2",
"R2" "R2",
"",
""
}; };
String InputDefault::get_joy_button_string(int p_button) { String InputDefault::get_joy_button_string(int p_button) {