summaryrefslogtreecommitdiffstats
path: root/core/variant/callable.h
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-07-28 20:46:31 +0200
committerGitHub <noreply@github.com>2022-07-28 20:46:31 +0200
commit14d021287bced6a7f5ab9db24936bd07b4cfdfd0 (patch)
treed56647d7c1a68b282074afbab8ccf4bf890718c2 /core/variant/callable.h
parent8e0f328a80a4c01bc4788a9aa6daaeb3097b4fab (diff)
parentca7d572908c58c587214b8f65bdd4078d0185ab2 (diff)
downloadredot-engine-14d021287bced6a7f5ab9db24936bd07b4cfdfd0.tar.gz
Merge pull request #63049 from Faless/mp/4.x_as_module
Diffstat (limited to 'core/variant/callable.h')
-rw-r--r--core/variant/callable.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant/callable.h b/core/variant/callable.h
index bbcf5427ba..954365d010 100644
--- a/core/variant/callable.h
+++ b/core/variant/callable.h
@@ -71,7 +71,7 @@ public:
void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, CallError &r_call_error) const;
void call_deferred(const Variant **p_arguments, int p_argcount) const;
- void rpc(int p_id, const Variant **p_arguments, int p_argcount, CallError &r_call_error) const;
+ Error rpc(int p_id, const Variant **p_arguments, int p_argcount, CallError &r_call_error) const;
_FORCE_INLINE_ bool is_null() const {
return method == StringName() && object == 0;
@@ -129,7 +129,7 @@ public:
virtual StringName get_method() const;
virtual ObjectID get_object() const = 0; //must always be able to provide an object
virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const = 0;
- virtual void rpc(int p_peer_id, const Variant **p_arguments, int p_argcount, Callable::CallError &r_call_error) const;
+ virtual Error rpc(int p_peer_id, const Variant **p_arguments, int p_argcount, Callable::CallError &r_call_error) const;
virtual const Callable *get_base_comparator() const;
CallableCustom();