diff options
| author | Juan Linietsky | 2015-05-19 21:36:35 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-19 21:36:35 -0300 |
| commit | 221443c5a2d174e52d391d15d5f1c6b5c9496d57 (patch) | |
| tree | dcea619ff3068a557c44aac5873676ea9e1a151c /core/io/resource_format_binary.cpp | |
| parent | f220183e40cb100cdfb8158c5217076377a62980 (diff) | |
| download | godot-221443c5a2d174e52d391d15d5f1c6b5c9496d57.tar.gz godot-221443c5a2d174e52d391d15d5f1c6b5c9496d57.tar.zst godot-221443c5a2d174e52d391d15d5f1c6b5c9496d57.zip | |
more fixes
-only refuse to load an older file if version major is different, fixes
#1944
-fix drive letter default value, fixes #1939
Diffstat (limited to 'core/io/resource_format_binary.cpp')
| -rw-r--r-- | core/io/resource_format_binary.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 3d7d2f236..9fb17bcff 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -861,7 +861,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) { print_bl("minor: "+itos(ver_minor)); print_bl("format: "+itos(ver_format)); - if (ver_format<FORMAT_VERSION || ver_major>VERSION_MAJOR || (ver_major==VERSION_MAJOR && ver_minor>VERSION_MINOR)) { + if (ver_format<FORMAT_VERSION || ver_major>VERSION_MAJOR) { f->close(); ERR_EXPLAIN("File Format '"+itos(FORMAT_VERSION)+"."+itos(ver_major)+"."+itos(ver_minor)+"' is too new! Please upgrade to a a new engine version: "+local_path); @@ -968,7 +968,7 @@ String ResourceInteractiveLoaderBinary::recognize(FileAccess *p_f) { uint32_t ver_minor=f->get_32(); uint32_t ver_format=f->get_32(); - if (ver_format<FORMAT_VERSION || ver_major>VERSION_MAJOR || (ver_major==VERSION_MAJOR && ver_minor>VERSION_MINOR)) { + if (ver_format<FORMAT_VERSION || ver_major>VERSION_MAJOR) { f->close(); return ""; |