diff options
author | Raul Santos <raulsntos@gmail.com> | 2022-06-03 18:29:10 +0200 |
---|---|---|
committer | Raul Santos <raulsntos@gmail.com> | 2022-06-03 20:37:46 +0200 |
commit | 3e53afd52c82262278681ea25c6cf36b27e483bf (patch) | |
tree | 8313e0e88439af56197309778737c43c4337cce1 /core | |
parent | c0bf18e92398c0d5a9cc3a9c51073ddcc5224b65 (diff) |
Add array element type to `get_connected_joypads`
Diffstat (limited to 'core')
-rw-r--r-- | core/input/input.cpp | 4 | ||||
-rw-r--r-- | core/input/input.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp index 4befdfac58..dbb6bd8d9c 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -1401,8 +1401,8 @@ String Input::get_joy_guid(int p_device) const { return joy_names[p_device].uid; } -Array Input::get_connected_joypads() { - Array ret; +TypedArray<int> Input::get_connected_joypads() { + TypedArray<int> ret; HashMap<int, Joypad>::Iterator elem = joy_names.begin(); while (elem) { if (elem->value.connected) { diff --git a/core/input/input.h b/core/input/input.h index 9a5b8e6e06..35812604b2 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -36,6 +36,7 @@ #include "core/os/keyboard.h" #include "core/os/thread_safe.h" #include "core/templates/rb_set.h" +#include "core/variant/typed_array.h" class Input : public Object { GDCLASS(Input, Object); @@ -259,7 +260,7 @@ public: float get_joy_axis(int p_device, JoyAxis p_axis) const; String get_joy_name(int p_idx); - Array get_connected_joypads(); + TypedArray<int> get_connected_joypads(); Vector2 get_joy_vibration_strength(int p_device); float get_joy_vibration_duration(int p_device); uint64_t get_joy_vibration_timestamp(int p_device); |