diff options
| author | Rémi Verschelde | 2017-02-02 08:07:48 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-02 08:07:47 +0100 |
| commit | af6d59eed6a09bfd68ffbecb751f80ac49e5604c (patch) | |
| tree | 24f4ff1425039e9ce5e76c8f6189a650f9366109 /main/input_default.cpp | |
| parent | ade3806a14df9d9be4c29ef994aeb351dba09254 (diff) | |
| parent | 9100db7b941348854dafad7860a4e466dba31ae6 (diff) | |
| download | godot-af6d59eed6a09bfd68ffbecb751f80ac49e5604c.tar.gz godot-af6d59eed6a09bfd68ffbecb751f80ac49e5604c.tar.zst godot-af6d59eed6a09bfd68ffbecb751f80ac49e5604c.zip | |
Merge pull request #7649 from Faless/fix_input_master
Keyboard Input modifiers do not block actions.
Diffstat (limited to 'main/input_default.cpp')
| -rw-r--r-- | main/input_default.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index 82dec8606..0561f2bb3 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -381,15 +381,12 @@ void InputDefault::parse_input_event(const InputEvent& p_event) { if (!p_event.is_echo()) { for (const Map<StringName,InputMap::Action>::Element *E=InputMap::get_singleton()->get_action_map().front();E;E=E->next()) { - if (InputMap::get_singleton()->event_is_action(p_event,E->key())) { - - if(is_action_pressed(E->key()) != p_event.is_pressed()) { - Action action; - action.fixed_frame=Engine::get_singleton()->get_fixed_frames(); - action.idle_frame=Engine::get_singleton()->get_idle_frames(); - action.pressed=p_event.is_pressed(); - action_state[E->key()]=action; - } + if (InputMap::get_singleton()->event_is_action(p_event,E->key()) && is_action_pressed(E->key()) != p_event.is_pressed()) { + Action action; + action.fixed_frame=Engine::get_singleton()->get_fixed_frames(); + action.idle_frame=Engine::get_singleton()->get_idle_frames(); + action.pressed=p_event.is_pressed(); + action_state[E->key()]=action; } } } |