asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20992 from Chaosus/conversion_fix

Browse source 
Fix int(String) != int(int) conversion
This commit is contained in:
Rémi Verschelde 2018-08-14 15:31:10 +02:00 committed by GitHub
commit 240462e998
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/variant.cpp
View file

@ -1192,7 +1192,7 @@ Variant::operator int64_t() const {
case BOOL: return _data._bool ? 1 : 0; case BOOL: return _data._bool ? 1 : 0;
case INT: return _data._int; case INT: return _data._int;
case REAL: return _data._real; case REAL: return _data._real;
case STRING: return operator String().to_int(); case STRING: return operator String().to_int64();
default: { default: {
return 0; return 0;

2
core/variant_call.cpp
View file

@ -1159,7 +1159,7 @@ Variant Variant::construct(const Variant::Type p_type, const Variant **p_args, i
return Variant(bool(*p_args[0])); return Variant(bool(*p_args[0]));
} }
case INT: { case INT: {
return (int(*p_args[0])); return (int64_t(*p_args[0]));
} }
case REAL: { case REAL: {
return real_t(*p_args[0]); return real_t(*p_args[0]);