summaryrefslogtreecommitdiff
path: root/core/variant
diff options
context:
space:
mode:
authorLyuma <xn.lyuma@gmail.com>2021-06-30 07:36:46 -0700
committerLyuma <xn.lyuma@gmail.com>2021-07-01 02:54:01 -0700
commit8f1efa656b2e91c159dff54a7b3af7bfb4659879 (patch)
treef129e656af813d8fcdc03b7d929baad8d317a6d1 /core/variant
parentbb409efa1cdcf314c3c0ece2a957b750869e4b09 (diff)
Add Callable.is_valid() analogous to FuncRef.is_valid() from 3.x
Diffstat (limited to 'core/variant')
-rw-r--r--core/variant/callable.cpp4
-rw-r--r--core/variant/callable.h1
-rw-r--r--core/variant/variant_call.cpp1
3 files changed, 6 insertions, 0 deletions
diff --git a/core/variant/callable.cpp b/core/variant/callable.cpp
index 34b3e3ea35..ca6f3d615e 100644
--- a/core/variant/callable.cpp
+++ b/core/variant/callable.cpp
@@ -89,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;
diff --git a/core/variant/callable.h b/core/variant/callable.h
index 20d0804292..52094af3aa 100644
--- a/core/variant/callable.h
+++ b/core/variant/callable.h
@@ -81,6 +81,7 @@ public:
_FORCE_INLINE_ bool is_standard() const {
return method != StringName();
}
+ bool is_valid() const;
Callable bind(const Variant **p_arguments, int p_argcount) const;
Callable unbind(int p_argcount) const;
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp
index 95c4e7121b..733361fe58 100644
--- a/core/variant/variant_call.cpp
+++ b/core/variant/variant_call.cpp
@@ -1630,6 +1630,7 @@ static void _register_variant_builtin_methods() {
bind_method(Callable, is_null, sarray(), varray());
bind_method(Callable, is_custom, sarray(), varray());
bind_method(Callable, is_standard, sarray(), varray());
+ bind_method(Callable, is_valid, sarray(), varray());
bind_method(Callable, get_object, sarray(), varray());
bind_method(Callable, get_object_id, sarray(), varray());
bind_method(Callable, get_method, sarray(), varray());