diff options
| author | Rémi Verschelde | 2017-02-26 21:30:24 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-26 21:30:24 +0100 |
| commit | 34a0aa6900880235f2ca78a7631f30cd3e3ecb2c (patch) | |
| tree | 3287927e4f90dc9a6c0c1d9487780407fdc610fc /platform/windows/joypad.cpp | |
| parent | 3de1415b6a0e3ad5bb39b6bcc3958305b0d415d4 (diff) | |
| parent | a175ac7032407af8e0ffe9fcb23edd5b57c6548f (diff) | |
| download | godot-34a0aa6900880235f2ca78a7631f30cd3e3ecb2c.tar.gz godot-34a0aa6900880235f2ca78a7631f30cd3e3ecb2c.tar.zst godot-34a0aa6900880235f2ca78a7631f30cd3e3ecb2c.zip | |
Diffstat (limited to 'platform/windows/joypad.cpp')
| -rw-r--r-- | platform/windows/joypad.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/platform/windows/joypad.cpp b/platform/windows/joypad.cpp index f2848268f..4c1eeb425 100644 --- a/platform/windows/joypad.cpp +++ b/platform/windows/joypad.cpp @@ -87,16 +87,6 @@ bool JoypadWindows::have_device(const GUID &p_guid) { return false; } -int JoypadWindows::check_free_joy_slot() const { - - for (int i = 0; i < JOYPADS_MAX; i++) { - - if (!attached_joypads[i]) - return i; - } - return -1; -} - // adapted from SDL2, works a lot better than the MSDN version bool JoypadWindows::is_xinput_device(const GUID *p_guid) { @@ -146,7 +136,7 @@ bool JoypadWindows::is_xinput_device(const GUID *p_guid) { bool JoypadWindows::setup_dinput_joypad(const DIDEVICEINSTANCE* instance) { HRESULT hr; - int num = check_free_joy_slot(); + int num = input->get_unused_joy_id(); if (have_device(instance->guidInstance) || num == -1) return false; @@ -296,7 +286,7 @@ void JoypadWindows::probe_joypads() { dwResult = xinput_get_state(i, &x_joypads[i].state); if ( dwResult == ERROR_SUCCESS) { - int id = check_free_joy_slot(); + int id = input->get_unused_joy_id(); if (id != -1 && !x_joypads[i].attached) { x_joypads[i].attached = true; |