diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-12 11:18:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 11:18:27 +0200 |
| commit | 8da1732013a4486c4822591b2211e1777be12fb7 (patch) | |
| tree | b6a3322948b8e70e66503e11ed510a911530b479 | |
| parent | dbb28559dbc0db6b040d138ca90fdf5f94f7eeb8 (diff) | |
| parent | 6fb86dda8a61fa05389df923c2b5a165545d8ddc (diff) | |
Merge pull request #11044 from hpvb/fix-enum-as-bool
Fix using enum as bool value
| -rw-r--r-- | core/io/file_access_pack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp index e36ff28220..e511085ac5 100644 --- a/core/io/file_access_pack.cpp +++ b/core/io/file_access_pack.cpp @@ -166,9 +166,9 @@ bool PackedSourcePCK::try_open_pack(const String &p_path) { uint32_t ver_rev = f->get_32(); ERR_EXPLAIN("Pack version unsupported: " + itos(version)); - ERR_FAIL_COND_V(version != PACK_VERSION, ERR_INVALID_DATA); + ERR_FAIL_COND_V(version != PACK_VERSION, false); ERR_EXPLAIN("Pack created with a newer version of the engine: " + itos(ver_major) + "." + itos(ver_minor) + "." + itos(ver_rev)); - ERR_FAIL_COND_V(ver_major > VERSION_MAJOR || (ver_major == VERSION_MAJOR && ver_minor > VERSION_MINOR), ERR_INVALID_DATA); + ERR_FAIL_COND_V(ver_major > VERSION_MAJOR || (ver_major == VERSION_MAJOR && ver_minor > VERSION_MINOR), false); for (int i = 0; i < 16; i++) { //reserved |