瀏覽代碼

Merge pull request #20992 from Chaosus/conversion_fix

Fix int(String) != int(int) conversion
Rémi Verschelde 7 年之前
父節點
當前提交
240462e998
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      core/variant.cpp
  2. 1 1
      core/variant_call.cpp

+ 1 - 1
core/variant.cpp

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

+ 1 - 1
core/variant_call.cpp

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