From 3150f9ce4ed9036e96fd38b215f987c2b17e871e Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Sat, 10 Jul 2021 22:17:51 +0800 Subject: [PATCH] Fix code read --- src/core/core.h | 2 +- src/core/file_sys/submission_package.cpp | 9 +++------ src/core/file_sys/submission_package.h | 2 +- src/core/loader/nsp.cpp | 2 +- src/core/loader/xci.cpp | 2 +- src/yuzu/game_list_worker.cpp | 11 +++++------ src/yuzu/main.cpp | 2 +- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/core/core.h b/src/core/core.h index 1d359d5319..b93c32e608 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -175,7 +175,7 @@ public: * @returns ResultStatus code, indicating if the operation succeeded. */ [[nodiscard]] ResultStatus Load(Frontend::EmuWindow& emu_window, const std::string& filepath, - u64 program_id, std::size_t program_index = 0); + u64 program_id = 0, std::size_t program_index = 0); /** * Indicates if the emulated system is powered on (all subsystems initialized and able to run an diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cpp index da8a5d95a1..861edec36c 100644 --- a/src/core/file_sys/submission_package.cpp +++ b/src/core/file_sys/submission_package.cpp @@ -21,7 +21,7 @@ namespace FileSys { NSP::NSP(VirtualFile file_, u64 title_id_, std::size_t program_index_) - : file(std::move(file_)), expect_program_id(title_id_), + : file(std::move(file_)), expected_program_id(title_id_), program_index(program_index_), status{Loader::ResultStatus::Success}, pfs(std::make_shared(file)), keys{Core::Crypto::KeyManager::Instance()} { if (pfs->GetStatus() != Loader::ResultStatus::Success) { @@ -63,7 +63,7 @@ u64 NSP::GetProgramTitleID() const { return GetExtractedTitleID(); } - auto program_id = expect_program_id; + auto program_id = expected_program_id; if (program_id == 0) { if (!program_status.empty()) { program_id = program_status.begin()->first; @@ -99,10 +99,7 @@ std::vector NSP::GetProgramTitleIDs() const { return {GetExtractedTitleID()}; } - std::vector out; - out.reserve(program_ids.size()); - for (const auto& title : program_ids) - out.push_back(title); + std::vector out{program_ids.cbegin(), program_ids.cend()}; return out; } diff --git a/src/core/file_sys/submission_package.h b/src/core/file_sys/submission_package.h index d3fa8e8cac..030f36c09f 100644 --- a/src/core/file_sys/submission_package.h +++ b/src/core/file_sys/submission_package.h @@ -70,7 +70,7 @@ private: VirtualFile file; - const u64 expect_program_id; + const u64 expected_program_id; const std::size_t program_index; bool extracted = false; diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp index 9df97d5f0f..8b167ad3c6 100644 --- a/src/core/loader/nsp.cpp +++ b/src/core/loader/nsp.cpp @@ -53,7 +53,7 @@ AppLoader_NSP::AppLoader_NSP(FileSys::VirtualFile file_, AppLoader_NSP::~AppLoader_NSP() = default; FileType AppLoader_NSP::IdentifyType(const FileSys::VirtualFile& nsp_file) { - const FileSys::NSP nsp(nsp_file, 0, 0); + const FileSys::NSP nsp(nsp_file); if (nsp.GetStatus() == ResultStatus::Success) { // Extracted Type case diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 42aee61585..269603eef9 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -44,7 +44,7 @@ AppLoader_XCI::AppLoader_XCI(FileSys::VirtualFile file_, AppLoader_XCI::~AppLoader_XCI() = default; FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& xci_file) { - const FileSys::XCI xci(xci_file, 0, 0); + const FileSys::XCI xci(xci_file); if (xci.GetStatus() == ResultStatus::Success && xci.GetNCAByType(FileSys::NCAContentType::Program) != nullptr && diff --git a/src/yuzu/game_list_worker.cpp b/src/yuzu/game_list_worker.cpp index f4c23cf6b9..2d5492157b 100644 --- a/src/yuzu/game_list_worker.cpp +++ b/src/yuzu/game_list_worker.cpp @@ -341,8 +341,8 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa if (res2 == Loader::ResultStatus::Success && program_ids.size() > 1 && (file_type == Loader::FileType::XCI || file_type == Loader::FileType::NSP)) { - for (const auto program_id : program_ids) { - loader = Loader::GetLoader(system, file, program_id); + for (const auto id : program_ids) { + loader = Loader::GetLoader(system, file, id); if (!loader) { continue; } @@ -353,12 +353,11 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa std::string name = " "; [[maybe_unused]] const auto res3 = loader->ReadTitle(name); - const FileSys::PatchManager patch{program_id, - system.GetFileSystemController(), + const FileSys::PatchManager patch{id, system.GetFileSystemController(), system.GetContentProvider()}; - emit EntryReady(MakeGameListEntry(physical_name, name, icon, *loader, - program_id, compatibility_list, patch), + emit EntryReady(MakeGameListEntry(physical_name, name, icon, *loader, id, + compatibility_list, patch), parent_dir); } } else { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 6f31b1e94f..f8f44d3ad5 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -360,7 +360,7 @@ GMainWindow::GMainWindow() } if (!game_path.isEmpty()) { - BootGame(game_path, 0); + BootGame(game_path); } }