diff options
author | Feng Chen <VonChenPlus@gmail.com> | 2021-07-20 07:10:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-20 07:10:05 +0200 |
commit | 07073734ed3785d1dee487f0c898a645fbd5f03c (patch) | |
tree | e7c72b615b7a551cc1fb8a6a336bce60e5a0d314 /src/core/loader/loader.cpp | |
parent | Merge pull request #6580 from ReinUsesLisp/xfb-radv (diff) | |
download | yuzu-07073734ed3785d1dee487f0c898a645fbd5f03c.tar yuzu-07073734ed3785d1dee487f0c898a645fbd5f03c.tar.gz yuzu-07073734ed3785d1dee487f0c898a645fbd5f03c.tar.bz2 yuzu-07073734ed3785d1dee487f0c898a645fbd5f03c.tar.lz yuzu-07073734ed3785d1dee487f0c898a645fbd5f03c.tar.xz yuzu-07073734ed3785d1dee487f0c898a645fbd5f03c.tar.zst yuzu-07073734ed3785d1dee487f0c898a645fbd5f03c.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/loader/loader.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 228dc6389..199e69e89 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -206,7 +206,8 @@ AppLoader::~AppLoader() = default; * @return std::unique_ptr<AppLoader> a pointer to a loader object; nullptr for unsupported type */ static std::unique_ptr<AppLoader> GetFileLoader(Core::System& system, FileSys::VirtualFile file, - FileType type, std::size_t program_index) { + FileType type, u64 program_id, + std::size_t program_index) { switch (type) { // Standard ELF file format. case FileType::ELF: @@ -227,7 +228,8 @@ static std::unique_ptr<AppLoader> GetFileLoader(Core::System& system, FileSys::V // NX XCI (nX Card Image) file format. case FileType::XCI: return std::make_unique<AppLoader_XCI>(std::move(file), system.GetFileSystemController(), - system.GetContentProvider(), program_index); + system.GetContentProvider(), program_id, + program_index); // NX NAX (NintendoAesXts) file format. case FileType::NAX: @@ -236,7 +238,8 @@ static std::unique_ptr<AppLoader> GetFileLoader(Core::System& system, FileSys::V // NX NSP (Nintendo Submission Package) file format case FileType::NSP: return std::make_unique<AppLoader_NSP>(std::move(file), system.GetFileSystemController(), - system.GetContentProvider(), program_index); + system.GetContentProvider(), program_id, + program_index); // NX KIP (Kernel Internal Process) file format case FileType::KIP: @@ -252,7 +255,7 @@ static std::unique_ptr<AppLoader> GetFileLoader(Core::System& system, FileSys::V } std::unique_ptr<AppLoader> GetLoader(Core::System& system, FileSys::VirtualFile file, - std::size_t program_index) { + u64 program_id, std::size_t program_index) { FileType type = IdentifyFile(file); const FileType filename_type = GuessFromFilename(file->GetName()); @@ -266,7 +269,7 @@ std::unique_ptr<AppLoader> GetLoader(Core::System& system, FileSys::VirtualFile LOG_DEBUG(Loader, "Loading file {} as {}...", file->GetName(), GetFileTypeString(type)); - return GetFileLoader(system, std::move(file), type, program_index); + return GetFileLoader(system, std::move(file), type, program_id, program_index); } } // namespace Loader |