diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-07 09:32:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-07 09:32:17 +0100 |
| commit | 8cb6d5daa4e41443d658265379b6079d8a087b41 (patch) | |
| tree | d428272dcd1536984990296b738eee88740cdd39 /scene/3d/arvr_nodes.cpp | |
| parent | b9f2f77dba00810ed83a4512bab9cf652c2627a0 (diff) | |
| parent | 0ca17116815176a17e1849c261514eb32347b81a (diff) | |
Merge pull request #36873 from BastiaanOlij/arvr_controller_button_is_bool
ARVRController.is_button_pressed requires to return a boolean
Diffstat (limited to 'scene/3d/arvr_nodes.cpp')
| -rw-r--r-- | scene/3d/arvr_nodes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/arvr_nodes.cpp b/scene/3d/arvr_nodes.cpp index bf85a8bd53..d23e5ffa08 100644 --- a/scene/3d/arvr_nodes.cpp +++ b/scene/3d/arvr_nodes.cpp @@ -300,7 +300,7 @@ int ARVRController::get_joystick_id() const { return tracker->get_joy_id(); }; -int ARVRController::is_button_pressed(int p_button) const { +bool ARVRController::is_button_pressed(int p_button) const { int joy_id = get_joystick_id(); if (joy_id == -1) { return false; |