diff options
author | Juan Linietsky <red@kyoko> | 2015-05-21 15:02:49 -0300 |
---|---|---|
committer | Juan Linietsky <red@kyoko> | 2015-05-21 15:02:49 -0300 |
commit | bb5d46bb113bca3204db7678eb69900f159e8087 (patch) | |
tree | cd34e10d67a196d217559ab8d4973b8f5bc4ccde /core/input_map.h | |
parent | 4b8745ad63409cf14b02735981ee35d2f794421c (diff) | |
parent | 6049479a99f66b620d59498a76ed9f2c3891f4c8 (diff) | |
download | redot-engine-bb5d46bb113bca3204db7678eb69900f159e8087.tar.gz |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/input_map.h')
-rw-r--r-- | core/input_map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/input_map.h b/core/input_map.h index 875a39555f..c5b21b1457 100644 --- a/core/input_map.h +++ b/core/input_map.h @@ -46,6 +46,8 @@ class InputMap : public Object { List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event) const; + Array _get_action_list(const StringName& p_action); + protected: static void _bind_methods(); |