Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CSharpScript should not own method infos of the base class #91564

Merged
merged 2 commits into from
May 10, 2024
Merged

CSharpScript should not own method infos of the base class #91564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c313312
CSharpScript should not own method infos of the base class
huisedenanhai May 20, 2023
1d70855
CSharpScript should not own base script signals
paulloz May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions modules/mono/csharp_script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,14 +1596,7 @@ void CSharpInstance::get_method_list(List<MethodInfo> *p_list) const {
return;
}

const CSharpScript *top = script.ptr();
while (top != nullptr) {
for (const CSharpScript::CSharpMethodInfo &E : top->methods) {
p_list->push_back(E.method_info);
}

top = top->base_script.ptr();
}
script->get_script_method_list(p_list);
}

bool CSharpInstance::has_method(const StringName &p_method) const {
Expand Down
8 changes: 3 additions & 5 deletions modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,11 +804,11 @@ static void AppendTypeName(StringBuilder sb, Type type)
using var methods = new Collections.Array();

Type? top = scriptType;
raulsntos marked this conversation as resolved.
Show resolved Hide resolved
Type native = GodotObject.InternalGetClassNativeBase(top);
Type native = GodotObject.InternalGetClassNativeBase(scriptType);

while (top != null && top != native)
if (scriptType != null && scriptType != native)
raulsntos marked this conversation as resolved.
Show resolved Hide resolved
{
var methodList = GetMethodListForType(top);
var methodList = GetMethodListForType(scriptType);

if (methodList != null)
{
Expand Down Expand Up @@ -859,8 +859,6 @@ static void AppendTypeName(StringBuilder sb, Type type)
methods.Add(methodInfo);
}
}

top = top.BaseType;
}

*outMethodsDest = NativeFuncs.godotsharp_array_new_copy(
Expand Down