diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-05 06:49:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 06:49:46 +0200 |
| commit | 5d529ba2e16a4d66dc2c8fb6e5302d69b69e3042 (patch) | |
| tree | de608c3c75c7ccd7db12283e97412804efe9851a | |
| parent | a53b08861ae0c53be6fa2f3eb34d216ab4d30116 (diff) | |
| parent | c510e2586dc84345a88f11fe3477df2e97976d73 (diff) | |
Merge pull request #18488 from AndreaCatania/ie0
Added method to clear input events of an action
| -rw-r--r-- | core/input_map.cpp | 8 | ||||
| -rw-r--r-- | core/input_map.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp index 67c0e4eb04..d33f40cbcf 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -48,6 +48,7 @@ void InputMap::_bind_methods() { ClassDB::bind_method(D_METHOD("action_add_event", "action", "event"), &InputMap::action_add_event); ClassDB::bind_method(D_METHOD("action_has_event", "action", "event"), &InputMap::action_has_event); ClassDB::bind_method(D_METHOD("action_erase_event", "action", "event"), &InputMap::action_erase_event); + ClassDB::bind_method(D_METHOD("action_erase_events", "action"), &InputMap::action_erase_events); ClassDB::bind_method(D_METHOD("get_action_list", "action"), &InputMap::_get_action_list); ClassDB::bind_method(D_METHOD("event_is_action", "event", "action"), &InputMap::event_is_action); ClassDB::bind_method(D_METHOD("load_from_globals"), &InputMap::load_from_globals); @@ -155,6 +156,13 @@ void InputMap::action_erase_event(const StringName &p_action, const Ref<InputEve input_map[p_action].inputs.erase(E); } +void InputMap::action_erase_events(const StringName &p_action) { + + ERR_FAIL_COND(!input_map.has(p_action)); + + input_map[p_action].inputs.clear(); +} + Array InputMap::_get_action_list(const StringName &p_action) { Array ret; diff --git a/core/input_map.h b/core/input_map.h index f497a2b86e..bdec75c65b 100644 --- a/core/input_map.h +++ b/core/input_map.h @@ -75,6 +75,7 @@ public: void action_add_event(const StringName &p_action, const Ref<InputEvent> &p_event); bool action_has_event(const StringName &p_action, const Ref<InputEvent> &p_event); void action_erase_event(const StringName &p_action, const Ref<InputEvent> &p_event); + void action_erase_events(const StringName &p_action); const List<Ref<InputEvent> > *get_action_list(const StringName &p_action); bool event_is_action(const Ref<InputEvent> &p_event, const StringName &p_action) const; |