summaryrefslogtreecommitdiffstats
path: root/core/input_map.h
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2016-10-17 03:57:32 +0200
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2016-10-19 17:52:49 +0200
commit17d7e6a142500a80ba6628a32eca792c44bbbdb7 (patch)
treec10e5dd3c04c1db13a86bb800072b9a6aee39b44 /core/input_map.h
parentc23e8797f1bec30defd1903cfeef0992cb1f1a89 (diff)
downloadredot-engine-17d7e6a142500a80ba6628a32eca792c44bbbdb7.tar.gz
Fix Keyboard Input Hangs when using modifiers
Main input parsing loop only update actions for keyboard if the state has changed. `InputMap::event_is_action` now ignores keyboard modifiers if the event is not pressed. Clarify difference between `InputMap::action_has_event` and `InputMap::event_is_action` in docs. Fixes #6388.
Diffstat (limited to 'core/input_map.h')
-rw-r--r--core/input_map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/input_map.h b/core/input_map.h
index 21c479588d..a974f6f103 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) const;
+ List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event, bool p_mod_ignore) const;
Array _get_action_list(const StringName& p_action);
Array _get_actions();