Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

GDScript: Allow strict conversion when assigning typed variables

3.1
George Marques 2018-07-25 13:12:07 +07:00
parent 96ee93e8c7
commit 1ac9c0fe3a
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/gdscript/gdscript_function.cpp
Unescape Escape View File

@ -743,13 +743,18 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
GD_ERR_BREAK(var_type < 0 || var_type >= Variant::VARIANT_MAX);
if (src->get_type() != var_type) {
err_text = "Trying to assign value of type '" + Variant::get_type_name(src->get_type()) +
"' to a variable of type '" + Variant::get_type_name(var_type) + "'.";
OPCODE_BREAK;
if (Variant::can_convert_strict(src->get_type(), var_type)) {
Variant::CallError ce;
*dst = Variant::construct(var_type, const_cast<const Variant **>(&src), 1, ce);
} else {
err_text = "Trying to assign value of type '" + Variant::get_type_name(src->get_type()) +
"' to a variable of type '" + Variant::get_type_name(var_type) + "'.";
OPCODE_BREAK;
}
} else {
*dst = *src;
}
*dst = *src;
ip += 4;
}
DISPATCH_OPCODE;