From 9100db7b941348854dafad7860a4e466dba31ae6 Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Wed, 25 Jan 2017 20:37:39 +0100
Subject: Keyboard Input modifiers do not block actions.

This means, if you press "F" while holding "shift" and there is and
action registered for "F" that action should be pressed.
This commit restore this behaviour, lost when implementing
is_action_just_pressed.
If you want "blocking modifiers" you should code it via script.

Fixes 6826
---
 core/input_map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/input_map.h')

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();
-- 
cgit v1.2.3