From 50eee9b2185c59c32fb82cf464230a058edd10ea Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 12 Aug 2023 15:18:55 -0400 Subject: fssystem: rework for yuzu style --- src/core/file_sys/content_archive.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/core/file_sys/content_archive.cpp') 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(); 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(reader->GetContentType()); - return static_cast(type); + return static_cast(reader->GetContentType()); } u64 NCA::GetTitleId() const { if (is_update) { return reader->GetProgramId() | 0x800; - } else { - return reader->GetProgramId(); } + return reader->GetProgramId(); } RightsId NCA::GetRightsId() const { -- cgit v1.2.3