diff options
Diffstat (limited to 'platform/osx/joystick_osx.cpp')
| -rw-r--r-- | platform/osx/joystick_osx.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/platform/osx/joystick_osx.cpp b/platform/osx/joystick_osx.cpp index c1359da0d..c03f481f0 100644 --- a/platform/osx/joystick_osx.cpp +++ b/platform/osx/joystick_osx.cpp @@ -271,7 +271,6 @@ void JoystickOSX::_device_removed(int p_id) { input->joy_connection_changed(p_id, false, ""); device_list[device].free(); device_list.remove(device); - attached_devices[p_id] = false; } static String _hex_str(uint8_t p_byte) { @@ -303,7 +302,7 @@ bool JoystickOSX::configure_joystick(IOHIDDeviceRef p_device_ref, joystick *p_jo } name = c_name; - int id = get_free_joy_id(); + int id = input->get_unused_joy_id(); ERR_FAIL_COND_V(id == -1, false); p_joy->id = id; int vendor = 0; @@ -512,16 +511,6 @@ void JoystickOSX::joystick_vibration_stop(int p_id, uint64_t p_timestamp) { FFEffectStop(joy->ff_object); } -int JoystickOSX::get_free_joy_id() { - for (int i = 0; i < JOYSTICKS_MAX; i++) { - if (!attached_devices[i]) { - attached_devices[i] = true; - return i; - } - } - return -1; -} - int JoystickOSX::get_joy_index(int p_id) const { for (int i = 0; i < device_list.size(); i++) { if (device_list[i].id == p_id) return i; @@ -582,10 +571,6 @@ JoystickOSX::JoystickOSX() { self = this; input = (InputDefault *)Input::get_singleton(); - for (int i = 0; i < JOYSTICKS_MAX; i++) { - attached_devices[i] = false; - } - int okay = 1; const void *vals[] = { (void *)create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, &okay), |