diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-04 10:19:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 10:19:00 +0100 |
| commit | 7889e9b7ca30418d914b8c698ea39490bc9be990 (patch) | |
| tree | a2ebacc202fdca89f0e958e0c8af7cf0b34975cd /modules/gdscript/gdscript_function.h | |
| parent | 31206ca4e98d55767f73416a4ce1b915be4c928e (diff) | |
| parent | d0b08342b8250aa76cdf934b97f2ab3ac114e259 (diff) | |
| download | redot-engine-7889e9b7ca30418d914b8c698ea39490bc9be990.tar.gz | |
Merge pull request #26562 from vnen/gdscript-no-implicit-cast
Forbid implicit type conversion in GDScript
Diffstat (limited to 'modules/gdscript/gdscript_function.h')
| -rw-r--r-- | modules/gdscript/gdscript_function.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index cefc28d77f..34fc51e92a 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -55,7 +55,7 @@ struct GDScriptDataType { StringName native_type; Ref<Script> script_type; - bool is_type(const Variant &p_variant, bool p_allow_implicit_conversion = false) const { + bool is_type(const Variant &p_variant) const { if (!has_type) return true; // Can't type check switch (kind) { @@ -63,11 +63,7 @@ struct GDScriptDataType { break; case BUILTIN: { Variant::Type var_type = p_variant.get_type(); - bool valid = builtin_type == var_type; - if (!valid && p_allow_implicit_conversion) { - valid = Variant::can_convert_strict(var_type, builtin_type); - } - return valid; + return builtin_type == var_type; } break; case NATIVE: { if (p_variant.get_type() == Variant::NIL) { |