diff options
Diffstat (limited to 'src/frontend_common')
| -rw-r--r-- | src/frontend_common/content_manager.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/frontend_common/content_manager.h b/src/frontend_common/content_manager.h index 1cbaa73f7..f3efe3465 100644 --- a/src/frontend_common/content_manager.h +++ b/src/frontend_common/content_manager.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include "core/core.h" | 9 | #include "core/core.h" |
| 10 | #include "core/file_sys/common_funcs.h" | 10 | #include "core/file_sys/common_funcs.h" |
| 11 | #include "core/file_sys/content_archive.h" | 11 | #include "core/file_sys/content_archive.h" |
| 12 | #include "core/file_sys/mode.h" | 12 | #include "core/file_sys/fs_filesystem.h" |
| 13 | #include "core/file_sys/nca_metadata.h" | 13 | #include "core/file_sys/nca_metadata.h" |
| 14 | #include "core/file_sys/patch_manager.h" | 14 | #include "core/file_sys/patch_manager.h" |
| 15 | #include "core/file_sys/registered_cache.h" | 15 | #include "core/file_sys/registered_cache.h" |
| @@ -159,7 +159,7 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf | |||
| 159 | }; | 159 | }; |
| 160 | 160 | ||
| 161 | std::shared_ptr<FileSys::NSP> nsp; | 161 | std::shared_ptr<FileSys::NSP> nsp; |
| 162 | FileSys::VirtualFile file = vfs.OpenFile(filename, FileSys::Mode::Read); | 162 | FileSys::VirtualFile file = vfs.OpenFile(filename, FileSys::OpenMode::Read); |
| 163 | if (boost::to_lower_copy(file->GetName()).ends_with(std::string("nsp"))) { | 163 | if (boost::to_lower_copy(file->GetName()).ends_with(std::string("nsp"))) { |
| 164 | nsp = std::make_shared<FileSys::NSP>(file); | 164 | nsp = std::make_shared<FileSys::NSP>(file); |
| 165 | if (nsp->IsExtractedType()) { | 165 | if (nsp->IsExtractedType()) { |
| @@ -224,7 +224,8 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string& | |||
| 224 | return true; | 224 | return true; |
| 225 | }; | 225 | }; |
| 226 | 226 | ||
| 227 | const auto nca = std::make_shared<FileSys::NCA>(vfs.OpenFile(filename, FileSys::Mode::Read)); | 227 | const auto nca = |
| 228 | std::make_shared<FileSys::NCA>(vfs.OpenFile(filename, FileSys::OpenMode::Read)); | ||
| 228 | const auto id = nca->GetStatus(); | 229 | const auto id = nca->GetStatus(); |
| 229 | 230 | ||
| 230 | // Game updates necessary are missing base RomFS | 231 | // Game updates necessary are missing base RomFS |
| @@ -345,8 +346,8 @@ inline std::vector<std::string> VerifyInstalledContents( | |||
| 345 | inline GameVerificationResult VerifyGameContents( | 346 | inline GameVerificationResult VerifyGameContents( |
| 346 | Core::System& system, const std::string& game_path, | 347 | Core::System& system, const std::string& game_path, |
| 347 | const std::function<bool(size_t, size_t)>& callback) { | 348 | const std::function<bool(size_t, size_t)>& callback) { |
| 348 | const auto loader = | 349 | const auto loader = Loader::GetLoader( |
| 349 | Loader::GetLoader(system, system.GetFilesystem()->OpenFile(game_path, FileSys::Mode::Read)); | 350 | system, system.GetFilesystem()->OpenFile(game_path, FileSys::OpenMode::Read)); |
| 350 | if (loader == nullptr) { | 351 | if (loader == nullptr) { |
| 351 | return GameVerificationResult::NotImplemented; | 352 | return GameVerificationResult::NotImplemented; |
| 352 | } | 353 | } |