diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-07 00:24:00 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-07 00:24:00 +0100 |
| commit | 7e65fd87253fecb630151bbc4c6ac31d5cfa01a0 (patch) | |
| tree | 18c79a69c18cad20b5a39cf6d3a58d9aba9f2390 /core | |
| parent | fcb0adf1329864b477129fc2bd8981338917fdd9 (diff) | |
| parent | bf8ec7b81b33b81e8f2fc61143ace32a29be4130 (diff) | |
| download | redot-engine-7e65fd87253fecb630151bbc4c6ac31d5cfa01a0.tar.gz | |
Merge pull request #89214 from bruvzg/pack_rel_off
[Export] Use relative file base offset for embedded PCK.
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/file_access_pack.cpp | 7 | ||||
| -rw-r--r-- | core/io/file_access_pack.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp index 7595bc41f5..991b94db38 100644 --- a/core/io/file_access_pack.cpp +++ b/core/io/file_access_pack.cpp @@ -196,6 +196,8 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files, return false; } + int64_t pck_start_pos = f->get_position() - 4; + uint32_t version = f->get_32(); uint32_t ver_major = f->get_32(); uint32_t ver_minor = f->get_32(); @@ -208,6 +210,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files, uint64_t file_base = f->get_64(); bool enc_directory = (pack_flags & PACK_DIR_ENCRYPTED); + bool rel_filebase = (pack_flags & PACK_REL_FILEBASE); for (int i = 0; i < 16; i++) { //reserved @@ -216,6 +219,10 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files, int file_count = f->get_32(); + if (rel_filebase) { + file_base += pck_start_pos; + } + if (enc_directory) { Ref<FileAccessEncrypted> fae; fae.instantiate(); diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h index c65e65d17d..0deacfebab 100644 --- a/core/io/file_access_pack.h +++ b/core/io/file_access_pack.h @@ -44,7 +44,8 @@ #define PACK_FORMAT_VERSION 2 enum PackFlags { - PACK_DIR_ENCRYPTED = 1 << 0 + PACK_DIR_ENCRYPTED = 1 << 0, + PACK_REL_FILEBASE = 1 << 1, }; enum PackFileFlags { |