diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-02 08:07:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 08:07:47 +0100 |
| commit | af6d59eed6a09bfd68ffbecb751f80ac49e5604c (patch) | |
| tree | 24f4ff1425039e9ce5e76c8f6189a650f9366109 /core/input_map.h | |
| parent | ade3806a14df9d9be4c29ef994aeb351dba09254 (diff) | |
| parent | 9100db7b941348854dafad7860a4e466dba31ae6 (diff) | |
Merge pull request #7649 from Faless/fix_input_master
Keyboard Input modifiers do not block actions.
Diffstat (limited to 'core/input_map.h')
| -rw-r--r-- | core/input_map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/input_map.h b/core/input_map.h index 306845fc89..6ccd24f29c 100644 --- a/core/input_map.h +++ b/core/input_map.h @@ -46,7 +46,7 @@ private: mutable Map<StringName, Action> input_map; mutable Map<int,StringName> input_id_map; - List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event, bool p_mod_ignore) const; + List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event, bool p_action_test=false) const; Array _get_action_list(const StringName& p_action); Array _get_actions(); |