diff options
author | Liam <byteslice@airmail.cc> | 2023-08-12 21:18:55 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-08-15 23:47:40 +0200 |
commit | 50eee9b2185c59c32fb82cf464230a058edd10ea (patch) | |
tree | beebc2d0da1fa0678a067de9c12cb7d11c775748 /src/core/file_sys/content_archive.cpp | |
parent | fssystem: reduce overalignment of unbuffered storage operations (diff) | |
download | yuzu-50eee9b2185c59c32fb82cf464230a058edd10ea.tar yuzu-50eee9b2185c59c32fb82cf464230a058edd10ea.tar.gz yuzu-50eee9b2185c59c32fb82cf464230a058edd10ea.tar.bz2 yuzu-50eee9b2185c59c32fb82cf464230a058edd10ea.tar.lz yuzu-50eee9b2185c59c32fb82cf464230a058edd10ea.tar.xz yuzu-50eee9b2185c59c32fb82cf464230a058edd10ea.tar.zst yuzu-50eee9b2185c59c32fb82cf464230a058edd10ea.zip |
Diffstat (limited to 'src/core/file_sys/content_archive.cpp')
-rw-r--r-- | src/core/file_sys/content_archive.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 2361b169e..44e6852fe 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -31,7 +31,7 @@ NCA::NCA(VirtualFile file_, const NCA* base_nca) reader = std::make_shared<NcaReader>(); if (Result rc = - reader->Initialize(file, GetCryptoConfiguration(), *GetNcaCompressionConfiguration()); + reader->Initialize(file, GetCryptoConfiguration(), GetNcaCompressionConfiguration()); R_FAILED(rc)) { if (rc != ResultInvalidNcaSignature) { LOG_ERROR(Loader, "File reader errored out during header read: {:#x}", @@ -102,7 +102,6 @@ NCA::NCA(VirtualFile file_, const NCA* base_nca) } } - // TODO: Is this correct?? if (header_reader.GetEncryptionType() == NcaFsHeader::EncryptionType::AesCtrEx) { is_update = true; } @@ -144,16 +143,14 @@ VirtualDir NCA::GetParentDirectory() const { } NCAContentType NCA::GetType() const { - u8 type = static_cast<u8>(reader->GetContentType()); - return static_cast<NCAContentType>(type); + return static_cast<NCAContentType>(reader->GetContentType()); } u64 NCA::GetTitleId() const { if (is_update) { return reader->GetProgramId() | 0x800; - } else { - return reader->GetProgramId(); } + return reader->GetProgramId(); } RightsId NCA::GetRightsId() const { |