diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-22 00:58:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 00:58:12 +0200 |
| commit | df590fc2d33c1ba715a4ce58f71d83e0ed9f5693 (patch) | |
| tree | 8bfdc3e033aaf4dc9a5de5e8040e4f99afa0c540 /core | |
| parent | 13f879587dd9bce59528e44b0faaf6e062f6d918 (diff) | |
| parent | 738d2ab96997faa1e13b91e38cf8a0000d829f70 (diff) | |
Merge pull request #10340 from Rubonnek/remove-unnecessary-assignments
Removed unnecessary assignments
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 3 | ||||
| -rw-r--r-- | core/io/file_access_compressed.cpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index a547ead5a1..c69fe17049 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -1406,11 +1406,10 @@ Error _File::open_encrypted_pass(const String &p_path, int p_mode_flags, const S Error _File::open_compressed(const String &p_path, int p_mode_flags, int p_compress_mode) { FileAccessCompressed *fac = memnew(FileAccessCompressed); - Error err = OK; fac->configure("GCPF", (Compression::Mode)p_compress_mode); - err = fac->_open(p_path, p_mode_flags); + Error err = fac->_open(p_path, p_mode_flags); if (err) { memdelete(fac); diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp index 34bce3f04f..959a5dc86f 100644 --- a/core/io/file_access_compressed.cpp +++ b/core/io/file_access_compressed.cpp @@ -368,7 +368,6 @@ FileAccessCompressed::FileAccessCompressed() { f = NULL; magic = "GCMP"; - block_size = 16384; cmode = Compression::MODE_ZSTD; writing = false; write_ptr = 0; |