1 files changed, 38 insertions, 5 deletions
diff --git a/core/variant/callable.cpp b/core/variant/callable.cpp
index bd51e2dd1e..f487e718f4 100644
--- a/core/variant/callable.cpp
+++ b/core/variant/callable.cpp
@@ -33,7 +33,7 @@
 #include "callable_bind.h"
 #include "core/object/message_queue.h"
 #include "core/object/object.h"
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
 
 void Callable::call_deferred(const Variant **p_arguments, int p_argcount) const {
@@ -50,10 +50,33 @@ void Callable::call(const Variant **p_arguments, int p_argcount, Variant &r_retu
 		custom->call(p_arguments, p_argcount, r_return_value, r_call_error);
 	} else {
 		Object *obj = ObjectDB::get_instance(ObjectID(object));
+#ifdef DEBUG_ENABLED
+		if (!obj) {
+			r_call_error.error = CallError::CALL_ERROR_INSTANCE_IS_NULL;
+			r_call_error.argument = 0;
+			r_call_error.expected = 0;
+			r_return_value = Variant();
+			return;
+		}
+#endif
 		r_return_value = obj->call(method, p_arguments, p_argcount, r_call_error);
 	}
 }
 
+void Callable::rpc(int p_id, const Variant **p_arguments, int p_argcount, CallError &r_call_error) const {
+	if (is_null()) {
+		r_call_error.error = CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_call_error.argument = 0;
+		r_call_error.expected = 0;
+	} else if (!is_custom()) {
+		r_call_error.error = CallError::CALL_ERROR_INVALID_METHOD;
+		r_call_error.argument = 0;
+		r_call_error.expected = 0;
+	} else {
+		custom->rpc(p_id, p_arguments, p_argcount, r_call_error);
+	}
+}
+
 Callable Callable::bind(const Variant **p_arguments, int p_argcount) const {
 	Vector<Variant> args;
 	args.resize(p_argcount);
@@ -66,6 +89,10 @@ Callable Callable::unbind(int p_argcount) const {
 	return Callable(memnew(CallableCustomUnbind(*this, p_argcount)));
 }
 
+bool Callable::is_valid() const {
+	return get_object() && (is_custom() || get_object()->has_method(get_method()));
+}
+
 Object *Callable::get_object() const {
 	if (is_null()) {
 		return nullptr;
@@ -126,7 +153,7 @@ bool Callable::operator==(const Callable &p_callable) const {
 	if (custom_a == custom_b) {
 		if (custom_a) {
 			if (custom == p_callable.custom) {
-				return true; //same pointer, dont even compare
+				return true; //same pointer, don't even compare
 			}
 
 			CallableCustom::CompareEqualFunc eq_a = custom->get_compare_equal_func();
@@ -155,7 +182,7 @@ bool Callable::operator<(const Callable &p_callable) const {
 	if (custom_a == custom_b) {
 		if (custom_a) {
 			if (custom == p_callable.custom) {
-				return false; //same pointer, dont even compare
+				return false; //same pointer, don't even compare
 			}
 
 			CallableCustom::CompareLessFunc less_a = custom->get_compare_less_func();
@@ -283,6 +310,12 @@ Callable::~Callable() {
 	}
 }
 
+void CallableCustom::rpc(int p_peer_id, const Variant **p_arguments, int p_argcount, Callable::CallError &r_call_error) const {
+	r_call_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
+	r_call_error.argument = 0;
+	r_call_error.expected = 0;
+}
+
 const Callable *CallableCustom::get_base_comparator() const {
 	return nullptr;
 }
@@ -374,8 +407,8 @@ Array Signal::get_connections() const {
 	object->get_signal_connection_list(name, &connections);
 
 	Array arr;
-	for (List<Object::Connection>::Element *E = connections.front(); E; E = E->next()) {
-		arr.push_back(E->get());
+	for (const Object::Connection &E : connections) {
+		arr.push_back(E);
 	}
 	return arr;
 }