diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-20 18:50:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-20 18:50:40 +0200 |
| commit | 50a0a401a10dda9718169d690b4b941100eb4a2c (patch) | |
| tree | ba1b10099dfbaf9798a16f619493a49a37701dbc /modules | |
| parent | 1acc76fecc9e613724c920633af6bae059444030 (diff) | |
| parent | 0ce49800acf464c2242c3f7e021b4ab8f49ec366 (diff) | |
Merge pull request #49281 from aaronfranke/use-enums-mouse-joypad
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdnative/xr/xr_interface_gdnative.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdnative/xr/xr_interface_gdnative.cpp b/modules/gdnative/xr/xr_interface_gdnative.cpp index 80077590df..e51542e23d 100644 --- a/modules/gdnative/xr/xr_interface_gdnative.cpp +++ b/modules/gdnative/xr/xr_interface_gdnative.cpp @@ -412,7 +412,7 @@ void GDAPI godot_xr_set_controller_button(godot_int p_controller_id, godot_int p if (tracker.is_valid()) { int joyid = tracker->get_joy_id(); if (joyid != -1) { - input->joy_button(joyid, p_button, p_is_pressed); + input->joy_button(joyid, (JoyButton)p_button, p_is_pressed); } } } @@ -431,7 +431,7 @@ void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_a Input::JoyAxisValue jx; jx.min = p_can_be_negative ? -1 : 0; jx.value = p_value; - input->joy_axis(joyid, p_axis, jx); + input->joy_axis(joyid, (JoyAxis)p_axis, jx); } } } |