asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #47988 from madmiraal/fix-46754-3.x

Browse source 
[3.x] Avoid creating joy_names map entries when using Map operator[]
This commit is contained in:
Rémi Verschelde 2021-04-18 11:31:48 +02:00 committed by GitHub
commit eaeb650367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
main/input_default.cpp
View file

@ -1216,9 +1216,10 @@ void InputDefault::add_joy_mapping(String p_mapping, bool p_update_existing) {
if (p_update_existing) { if (p_update_existing) {
Vector<String> entry = p_mapping.split(","); Vector<String> entry = p_mapping.split(",");
String uid = entry[0]; String uid = entry[0];
for (int i = 0; i < joy_names.size(); i++) { for (Map<int, Joypad>::Element *E = joy_names.front(); E; E = E->next()) {
if (uid == joy_names[i].uid) { Joypad &joy = E->get();
joy_names[i].mapping = map_db.size() - 1; if (joy.uid == uid) {
joy.mapping = map_db.size() - 1;
} }
} }
} }
@ -1230,9 +1231,10 @@ void InputDefault::remove_joy_mapping(String p_guid) {
map_db.remove(i); map_db.remove(i);
} }
} }
for (int i = 0; i < joy_names.size(); i++) { for (Map<int, Joypad>::Element *E = joy_names.front(); E; E = E->next()) {
if (joy_names[i].uid == p_guid) { Joypad &joy = E->get();
joy_names[i].mapping = -1; if (joy.uid == p_guid) {
joy.mapping = -1;
} }
} }
} }
@ -1259,8 +1261,13 @@ String InputDefault::get_joy_guid(int p_device) const {
//platforms that use the remapping system can override and call to these ones //platforms that use the remapping system can override and call to these ones
bool InputDefault::is_joy_mapped(int p_device) { bool InputDefault::is_joy_mapped(int p_device) {
int mapping = joy_names[p_device].mapping; if (joy_names.has(p_device)) {
return mapping != -1 ? (mapping != fallback_mapping) : false; int mapping = joy_names[p_device].mapping;
if (mapping != -1 && mapping != fallback_mapping) {
return true;
}
}
return false;
} }
String InputDefault::get_joy_guid_remapped(int p_device) const { String InputDefault::get_joy_guid_remapped(int p_device) const {