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

Merge pull request #62440 from timothyqiu/thread-func-base

Browse source 
[3.x] Check thread func in base scripts for argument info
This commit is contained in:
Rémi Verschelde 2022-06-28 08:11:11 +02:00 committed by GitHub
commit d74ff8dd93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/bind/core_bind.cpp
View file

@ -2693,12 +2693,18 @@ void _Thread::_start_func(void *ud) {
// We must check if we are in case b).
int target_param_count = 0;
int target_default_arg_count = 0;
Ref<Script> script = target_instance->get_script();
if (script.is_valid()) {
MethodInfo mi = script->get_method_info(t->target_method);
target_param_count = mi.arguments.size();
target_default_arg_count = mi.default_arguments.size();
} else {
while (script.is_valid()) {
if (script->has_method(t->target_method)) {
MethodInfo mi = script->get_method_info(t->target_method);
target_param_count = mi.arguments.size();
target_default_arg_count = mi.default_arguments.size();
break;
}
script = script->get_base_script();
}
if (script.is_null()) {
MethodBind *method = ClassDB::get_method(target_instance->get_class_name(), t->target_method);
if (method) {
target_param_count = method->get_argument_count();