diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-17 13:31:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-17 13:31:08 +0200 |
| commit | de4aabe89b7b68677f145f21c956183bbc92f686 (patch) | |
| tree | 20b2e819d599d6d1bd459bb51880c31e97cfe825 /core/input_map.cpp | |
| parent | 40640a01dc90be00e55e4eef3c7800401ef63b18 (diff) | |
| parent | 71d71d55b5c0d6da4d1555823ac432bf0b33389a (diff) | |
Merge pull request #31244 from Unholydeath/BB_ChangeErrorMacros
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/'
Diffstat (limited to 'core/input_map.cpp')
| -rw-r--r-- | core/input_map.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp index 165999f081..2a8ac435fe 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -192,10 +192,7 @@ bool InputMap::event_is_action(const Ref<InputEvent> &p_event, const StringName bool InputMap::event_get_action_status(const Ref<InputEvent> &p_event, const StringName &p_action, bool *p_pressed, float *p_strength) const { Map<StringName, Action>::Element *E = input_map.find(p_action); - if (!E) { - ERR_EXPLAIN("Request for nonexistent InputMap action: " + String(p_action)); - ERR_FAIL_V(false); - } + ERR_FAIL_COND_V_MSG(!E, false, "Request for nonexistent InputMap action: " + String(p_action) + "."); Ref<InputEventAction> input_event_action = p_event; if (input_event_action.is_valid()) { |