asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added an is_valid function to FuncRef so script can check if it is safe to call it.

Browse source
This commit is contained in:
Rikhardur Bjarni Einarsson 2019-04-29 23:38:42 +01:00
parent 7018de8425
commit 9be8424ef9
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/func_ref.cpp
View file

@ -51,11 +51,23 @@ void FuncRef::set_instance(Object *p_obj) {
ERR_FAIL_NULL(p_obj); ERR_FAIL_NULL(p_obj);
id = p_obj->get_instance_id(); id = p_obj->get_instance_id();
} }
void FuncRef::set_function(const StringName &p_func) { void FuncRef::set_function(const StringName &p_func) {
function = p_func; function = p_func;
} }
bool FuncRef::is_valid() const {
if (id == 0)
return false;
Object *obj = ObjectDB::get_instance(id);
if (!obj)
return false;
return obj->has_method(function);
}
void FuncRef::_bind_methods() { void FuncRef::_bind_methods() {
{ {
@ -67,6 +79,7 @@ void FuncRef::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_instance", "instance"), &FuncRef::set_instance); ClassDB::bind_method(D_METHOD("set_instance", "instance"), &FuncRef::set_instance);
ClassDB::bind_method(D_METHOD("set_function", "name"), &FuncRef::set_function); ClassDB::bind_method(D_METHOD("set_function", "name"), &FuncRef::set_function);
ClassDB::bind_method(D_METHOD("is_valid"), &FuncRef::is_valid);
} }
FuncRef::FuncRef() : FuncRef::FuncRef() :

1
core/func_ref.h
View file

@ -46,6 +46,7 @@ public:
Variant call_func(const Variant **p_args, int p_argcount, Variant::CallError &r_error); Variant call_func(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
void set_instance(Object *p_obj); void set_instance(Object *p_obj);
void set_function(const StringName &p_func); void set_function(const StringName &p_func);
bool is_valid() const;
FuncRef(); FuncRef();
}; };