diff options
| author | Rémi Verschelde | 2016-01-22 23:06:54 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-01-22 23:06:54 +0100 |
| commit | ed3c73408b3b0ddf234ddcc5349fe85831e3ebba (patch) | |
| tree | 9796583da6e2d685aed1ce66439d79926d05c33d /platform/javascript | |
| parent | 14c1d7fef00dbd653dcc21102679575955a694dc (diff) | |
| parent | 1ad6ca0a81e627bb5fe8b7c88f16213abbf6ddef (diff) | |
| download | godot-ed3c73408b3b0ddf234ddcc5349fe85831e3ebba.tar.gz godot-ed3c73408b3b0ddf234ddcc5349fe85831e3ebba.tar.zst godot-ed3c73408b3b0ddf234ddcc5349fe85831e3ebba.zip | |
Merge pull request #3412 from Hinsbart/add_mapping
add gamepad mapping (ps4 pad, html5/win/firefox)
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index ffbcd9824..562733ab8 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -623,7 +623,7 @@ void OS_JavaScript::process_joysticks() { emscripten_get_gamepad_status(i, &state); if (state.connected) { - int num_buttons = MIN(state.numButtons, 16); + int num_buttons = MIN(state.numButtons, 18); int num_axes = MIN(state.numAxes, 8); for (int j = 0; j < num_buttons; j++) { |