seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48696 from madmiraal/fix-48692

Browse Source 
Fix `InputMap.action_erase_event()` failing to erase events correctly.
This commit is contained in:
Rémi Verschelde
2021-06-20 00:29:42 +02:00
committed by GitHub
parent d88be9b70c 7104229a85
commit 4effadc0ba
7 changed files with 74 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/input/input_map.cpp
View File

@ -130,12 +130,9 @@ List<Ref<InputEvent>>::Element *InputMap::_find_event(Action &p_action, const Re
for (List<Ref<InputEvent>>::Element *E = p_action.inputs.front(); E; E = E->next()) {
const Ref<InputEvent> e = E->get();
//if (e.type != Ref<InputEvent>::KEY && e.device != p_event.device) -- unsure about the KEY comparison, why is this here?
// continue;
int device = e->get_device();
if (device == ALL_DEVICES || device == p_event->get_device()) {
if (p_exact_match && e->shortcut_match(p_event)) {
if (p_exact_match && e->is_match(p_event, true)) {
return E;
} else if (!p_exact_match && e->action_match(p_event, p_pressed, p_strength, p_raw_strength, p_action.deadzone)) {
return E;