summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2017-09-07 11:39:14 +0200
committerHein-Pieter van Braam <hp@tmm.cx>2017-09-07 11:39:14 +0200
commit6fb86dda8a61fa05389df923c2b5a165545d8ddc (patch)
tree15ae844da69ef2b833ecc6a57a98a505e00d03d6 /core
parent5f0d367fef25b30742ba71f12e339137e02c59ab (diff)
Fix using enum as bool value
This warning actually hid a bug. The value of ERR_INVALID_DATA is actually 30, returning this as a bool returns true while false was required.
Diffstat (limited to 'core')
-rw-r--r--core/io/file_access_pack.cpp4
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