godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Apply feedback

Browse Source
This commit is contained in:
MJacred
2025-01-13 16:23:55 +01:00
parent f7c6a8659a
commit e98f3a6bf0
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/input/input.cpp
View File

@@ -1709,28 +1709,40 @@ void Input::add_joy_mapping(const String &p_mapping, bool p_update_existing) {
} }
void Input::remove_joy_mapping(const String &p_guid) { void Input::remove_joy_mapping(const String &p_guid) {
int index_removed = 0; int index_removed = -1;
int count = 0;
for (int i = map_db.size() - 1; i >= 0; i--) { for (int i = map_db.size() - 1; i >= 0; i--) {
if (p_guid == map_db[i].uid) { if (p_guid == map_db[i].uid) {
map_db.remove_at(i); map_db.remove_at(i);
index_removed = i; index_removed = i;
if (i == fallback_mapping) { if (i < fallback_mapping){
count++;
} else if (i == fallback_mapping) {
fallback_mapping = -1; fallback_mapping = -1;
WARN_PRINT_ONCE(vformat("Removed fallback joypad input mapping \"%s\". This could lead to joypads not working as intended.", p_guid)); WARN_PRINT_ONCE(vformat("Removed fallback joypad input mapping \"%s\". This could lead to joypads not working as intended.", p_guid));
} }
} }
} }
if (index_removed == -1) {
return; // Not found.
}
if (fallback_mapping > 0){
// Fixing the shifted index.
fallback_mapping -= count;
}
for (KeyValue<int, Joypad> &E : joy_names) { for (KeyValue<int, Joypad> &E : joy_names) {
Joypad &joy = E.value; Joypad &joy = E.value;
if (joy.uid == p_guid) { if (joy.puid == _guid) {
_set_joypad_mapping(joy, -1); _set_joypad_mapping(joy, fallback_mapping);
} else if (joy.mapping > index_removed) { } else if (joy.mapping > index_removed) {
// The map_db update offset this joypad's mapping reference, update it: // The map_db update offset this joypad's mapping reference, update it:
_set_joypad_mapping(joy, map_db[joy.mapping - 1]); _set_joypad_mapping(joy, joy.mapping - 1);
} }
} }
} }