diff options
author | Lioncash <mathew1800@gmail.com> | 2020-09-16 08:19:25 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-09-16 08:46:59 -0400 |
commit | 113a3972a6487430ab94f08a4a66742739ff48c2 (patch) | |
tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nca.cpp | |
parent | 004bfefeb57898ad38af6255bc6ccc6bb1e35fbd (diff) |
core/loader: Remove dependencies on the global system instance
Now all that remains is:
18 instances in file_sys code
14 instances in GDB stub code (this can be tossed wholesale)
4 instances in HLE code
2 instances in settings code.
Diffstat (limited to 'src/core/loader/nca.cpp')
-rw-r--r-- | src/core/loader/nca.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index 5a0469978..50d7a0f32 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp @@ -31,7 +31,7 @@ FileType AppLoader_NCA::IdentifyType(const FileSys::VirtualFile& file) { return FileType::Error; } -AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process) { +AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process, Core::System& system) { if (is_loaded) { return {ResultStatus::ErrorAlreadyLoaded, {}}; } @@ -52,13 +52,13 @@ AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process) { directory_loader = std::make_unique<AppLoader_DeconstructedRomDirectory>(exefs, true); - const auto load_result = directory_loader->Load(process); + const auto load_result = directory_loader->Load(process, system); if (load_result.first != ResultStatus::Success) { return load_result; } if (nca->GetRomFS() != nullptr && nca->GetRomFS()->GetSize() > 0) { - Core::System::GetInstance().GetFileSystemController().RegisterRomFS( + system.GetFileSystemController().RegisterRomFS( std::make_unique<FileSys::RomFSFactory>(*this)); } |