diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-18 13:12:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 13:12:54 +0100 |
| commit | 869f5b53288ec713553e024f91ec88b47ce960d9 (patch) | |
| tree | 1462d44f94daab7f896f9a08def8e0fa32585513 /platform/javascript/display_server_javascript.h | |
| parent | 688f4aebef57e77e843b52cfb97c31f3ea426c0e (diff) | |
| parent | bab20c6e094cd40427fc76890c3aeef3a0ba4e1c (diff) | |
Merge pull request #45078 from Faless/js/4.x_gamepads
[HTML5] Use internal implementation of the Gamepad API.
Diffstat (limited to 'platform/javascript/display_server_javascript.h')
| -rw-r--r-- | platform/javascript/display_server_javascript.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/javascript/display_server_javascript.h b/platform/javascript/display_server_javascript.h index 916be1ae45..e28fbc56f3 100644 --- a/platform/javascript/display_server_javascript.h +++ b/platform/javascript/display_server_javascript.h @@ -86,7 +86,7 @@ private: static EM_BOOL touch_press_callback(int p_event_type, const EmscriptenTouchEvent *p_event, void *p_user_data); static EM_BOOL touchmove_callback(int p_event_type, const EmscriptenTouchEvent *p_event, void *p_user_data); - static EM_BOOL gamepad_change_callback(int p_event_type, const EmscriptenGamepadEvent *p_event, void *p_user_data); + static void gamepad_callback(int p_index, int p_connected, const char *p_id, const char *p_guid); void process_joypads(); static Vector<String> get_rendering_drivers_func(); |