noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

GDScript: Fix wrong file in superclass function error

Browse Source
This commit is contained in:
rune-scape
2023-06-07 04:32:24 -07:00
committed by rune-scape
parent 6efa557e9b
commit 14a6614dad
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gdscript/gdscript_vm.cpp
+6 -17
View File
@@ -507,18 +507,13 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
if (unlikely(++call_depth > MAX_CALL_DEPTH)) {
call_depth--;
#ifdef DEBUG_ENABLED
String err_file;
if (p_instance && ObjectDB::get_instance(p_instance->owner_id) != nullptr && p_instance->script->is_valid() && !p_instance->script->path.is_empty()) {
err_file = p_instance->script->path;
} else if (_script) {
err_file = _script->path;
}
String err_file = source;
if (err_file.is_empty()) {
err_file = "<built-in>";
}
String err_func = name;
if (p_instance && ObjectDB::get_instance(p_instance->owner_id) != nullptr && p_instance->script->is_valid() && p_instance->script->local_name != StringName()) {
err_func = p_instance->script->local_name.operator String() + "." + err_func;
if (!_script->local_name.is_empty()) {
err_func = String(_script->local_name) + "." + err_func;
}
int err_line = _initial_line;
const char *err_text = "Stack overflow. Check for infinite recursion in your script.";
@@ -3926,19 +3921,13 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
}
//error
// function, file, line, error, explanation
String err_file;
bool instance_valid_with_script = p_instance && ObjectDB::get_instance(p_instance->owner_id) != nullptr && p_instance->script->is_valid();
if (instance_valid_with_script && !get_script()->path.is_empty()) {
err_file = get_script()->path;
} else if (script) {
err_file = script->path;
}
String err_file = source;
if (err_file.is_empty()) {
err_file = "<built-in>";
}
String err_func = name;
if (instance_valid_with_script && p_instance->script->local_name != StringName()) {
err_func = p_instance->script->local_name.operator String() + "." + err_func;
if (!_script->local_name.is_empty()) {
err_func = String(_script->local_name) + "." + err_func;
}
int err_line = line;
if (err_text.is_empty()) {