Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.x] GDScript: Fix get_method_list for custom functions

Browse source
This commit is contained in:
Danil Alexeev 2022-11-09 17:59:35 +03:00
parent a81d96c637
commit e922e49b13
No known key found for this signature in database
GPG key ID: 124453E157DA8DC7
3 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/gdscript/gdscript.cpp
View file

@ -223,11 +223,15 @@ void GDScript::get_script_method_list(List<MethodInfo> *p_list) const {
GDScriptFunction *func = E->get();
MethodInfo mi;
mi.name = E->key();
for (int i = 0; i < func->get_argument_count(); i++) {
mi.arguments.push_back(func->get_argument_type(i));
}
mi.return_val = func->get_return_type();
for (int i = 0; i < func->get_argument_count(); i++) {
PropertyInfo arginfo = func->get_argument_type(i);
arginfo.name = func->get_argument_name(i);
mi.arguments.push_back(arginfo);
}
for (int i = 0; i < func->get_default_argument_count(); i++) {
mi.default_arguments.push_back(func->get_default_argument_value(i));
}
p_list->push_back(mi);
}
@ -276,11 +280,15 @@ MethodInfo GDScript::get_method_info(const StringName &p_method) const {
GDScriptFunction *func = E->get();
MethodInfo mi;
mi.name = E->key();
for (int i = 0; i < func->get_argument_count(); i++) {
mi.arguments.push_back(func->get_argument_type(i));
}
mi.return_val = func->get_return_type();
for (int i = 0; i < func->get_argument_count(); i++) {
PropertyInfo arginfo = func->get_argument_type(i);
arginfo.name = func->get_argument_name(i);
mi.arguments.push_back(arginfo);
}
for (int i = 0; i < func->get_default_argument_count(); i++) {
mi.default_arguments.push_back(func->get_default_argument_value(i));
}
return mi;
}
@ -1166,11 +1174,18 @@ void GDScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
const GDScript *sptr = script.ptr();
while (sptr) {
for (Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.front(); E; E = E->next()) {
GDScriptFunction *func = E->get();
MethodInfo mi;
mi.name = E->key();
mi.return_val = func->get_return_type();
mi.flags |= METHOD_FLAG_FROM_SCRIPT;
for (int i = 0; i < E->get()->get_argument_count(); i++) {
mi.arguments.push_back(PropertyInfo(Variant::NIL, "arg" + itos(i)));
PropertyInfo arginfo = func->get_argument_type(i);
arginfo.name = func->get_argument_name(i);
mi.arguments.push_back(arginfo);
}
for (int i = 0; i < func->get_default_argument_count(); i++) {
mi.default_arguments.push_back(func->get_default_argument_value(i));
}
p_list->push_back(mi);
}