summaryrefslogtreecommitdiff
path: root/scene/main/scene_main_loop.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-14 10:03:53 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-14 10:03:53 -0300
commitd093cc8bf86c048b90ac47183d7bf45d15f36e43 (patch)
tree0fd131bee2fcc97ed444d422f17f7342baf710b1 /scene/main/scene_main_loop.h
parentda4170540cbe3dcec4855ddbb59edf1abd7cf9b4 (diff)
Renamed call_group to call_group_flags, made call_group without flags the default
Diffstat (limited to 'scene/main/scene_main_loop.h')
-rw-r--r--scene/main/scene_main_loop.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/scene/main/scene_main_loop.h b/scene/main/scene_main_loop.h
index 9de4abe81e..f4271e5454 100644
--- a/scene/main/scene_main_loop.h
+++ b/scene/main/scene_main_loop.h
@@ -242,9 +242,11 @@ friend class Node;
void _notify_group_pause(const StringName& p_group,int p_notification);
void _call_input_pause(const StringName& p_group,const StringName& p_method,const InputEvent& p_input);
+ Variant _call_group_flags(const Variant** p_args, int p_argcount, Variant::CallError& r_error);
Variant _call_group(const Variant** p_args, int p_argcount, Variant::CallError& r_error);
+
static void _debugger_request_tree(void *self);
void _flush_delete_queue();
//optimization
@@ -332,17 +334,20 @@ public:
GROUP_CALL_REVERSE=1,
GROUP_CALL_REALTIME=2,
GROUP_CALL_UNIQUE=4,
- GROUP_CALL_MULIILEVEL=8,
+ GROUP_CALL_MULTILEVEL=8,
};
_FORCE_INLINE_ Viewport *get_root() const { return root; }
uint32_t get_last_event_id() const;
- void call_group(uint32_t p_call_flags,const StringName& p_group,const StringName& p_function,VARIANT_ARG_LIST);
- void notify_group(uint32_t p_call_flags,const StringName& p_group,int p_notification);
- void set_group(uint32_t p_call_flags,const StringName& p_group,const String& p_name,const Variant& p_value);
+ void call_group_flags(uint32_t p_call_flags,const StringName& p_group,const StringName& p_function,VARIANT_ARG_LIST);
+ void notify_group_flags(uint32_t p_call_flags,const StringName& p_group,int p_notification);
+ void set_group_flags(uint32_t p_call_flags,const StringName& p_group,const String& p_name,const Variant& p_value);
+ void call_group(const StringName& p_group,const StringName& p_function,VARIANT_ARG_LIST);
+ void notify_group(const StringName& p_group,int p_notification);
+ void set_group(const StringName& p_group,const String& p_name,const Variant& p_value);
virtual void input_text( const String& p_text );
virtual void input_event( const InputEvent& p_event );