diff options
| author | Rémi Verschelde | 2017-03-27 08:51:15 +0200 |
|---|---|---|
| committer | GitHub | 2017-03-27 08:51:15 +0200 |
| commit | b3d1113ae3ed8974e85025ddaea178683d279de9 (patch) | |
| tree | b4845b314332792a153dbf5a922ad3a3b5aa8fc1 /main/input_default.cpp | |
| parent | 93107f42454781079dccff1543a841c394480b41 (diff) | |
| parent | 8c06da0d49825dd4cbdd48f0cb7f2bb80b10a56e (diff) | |
| download | godot-b3d1113ae3ed8974e85025ddaea178683d279de9.tar.gz godot-b3d1113ae3ed8974e85025ddaea178683d279de9.tar.zst godot-b3d1113ae3ed8974e85025ddaea178683d279de9.zip | |
Merge pull request #8152 from Hinsbart/input_id_2.1
[2.1] Better handling of joypad device IDs.
Diffstat (limited to 'main/input_default.cpp')
| -rw-r--r-- | main/input_default.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index 1c4b8f8e5..61169985b 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1157,6 +1157,15 @@ int InputDefault::get_joy_button_index_from_string(String p_button) { ERR_FAIL_V(-1); } +int InputDefault::get_unused_joy_id() { + for (int i = 0; i < JOYSTICKS_MAX; i++) { + if (!joy_names.has(i) || !joy_names[i].connected) { + return i; + } + } + return -1; +} + String InputDefault::get_joy_axis_string(int p_axis) { ERR_FAIL_INDEX_V(p_axis, JOY_AXIS_MAX, ""); return _axes[p_axis]; |