diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-27 11:29:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 11:29:05 +0200 |
| commit | 378ebffb23bac570e3c85cfa176f668784b6a7a5 (patch) | |
| tree | 6d6b3b36d3308157bcba79d455c3cfa05fec7413 /core/os/input_event.cpp | |
| parent | 96be4649528f4b6f4cefacc6adac6f2ddd14aa10 (diff) | |
| parent | 3204befd1eb42cc87ae296148e1361a8b001d08d (diff) | |
| download | redot-engine-378ebffb23bac570e3c85cfa176f668784b6a7a5.tar.gz | |
Merge pull request #8936 from Hinsbart/fix_action
Fix InputEvent actions.
Diffstat (limited to 'core/os/input_event.cpp')
| -rw-r--r-- | core/os/input_event.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index cf3b8f74ec..7ec76c1eed 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -62,11 +62,11 @@ bool InputEvent::is_action(const StringName &p_action) const { bool InputEvent::is_action_pressed(const StringName &p_action) const { - return false; // InputMap::get_singleton()->event_is_action(Ref<InputEvent>(this),p_action); + return (is_pressed() && !is_echo() && is_action(p_action)); } bool InputEvent::is_action_released(const StringName &p_action) const { - return false; + return (!is_pressed() && is_action(p_action)); } bool InputEvent::is_echo() const { |