summaryrefslogtreecommitdiff
path: root/core/message_queue.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/message_queue.h')
-rw-r--r--core/message_queue.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/message_queue.h b/core/message_queue.h
index 5cee21847b..6a3ec79732 100644
--- a/core/message_queue.h
+++ b/core/message_queue.h
@@ -5,7 +5,7 @@
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
-/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
@@ -46,7 +46,10 @@ class MessageQueue {
enum {
TYPE_CALL,
TYPE_NOTIFICATION,
- TYPE_SET
+ TYPE_SET,
+ FLAG_SHOW_ERROR=1<<14,
+ FLAG_MASK=FLAG_SHOW_ERROR-1
+
};
struct Message {
@@ -65,12 +68,14 @@ class MessageQueue {
uint32_t buffer_max_used;
uint32_t buffer_size;
+ void _call_function(Object* p_target,const StringName& p_func,const Variant *p_args,int p_argcount,bool p_show_error);
static MessageQueue *singleton;
public:
static MessageQueue *get_singleton();
+ Error push_call(ObjectID p_id,const StringName& p_method,const Variant** p_args,int p_argcount,bool p_show_error=false);
Error push_call(ObjectID p_id, const StringName& p_method, VARIANT_ARG_LIST);
Error push_notification(ObjectID p_id, int p_notification);
Error push_set(ObjectID p_id, const StringName& p_prop, const Variant& p_value);