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/nax.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/nax.cpp')
-rw-r--r-- | src/core/loader/nax.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index a152981a01..49028177bc 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp @@ -41,7 +41,8 @@ FileType AppLoader_NAX::GetFileType() const { return IdentifyTypeImpl(*nax); } -AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process) { +AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process, + [[maybe_unused]] Core::System& system) { if (is_loaded) { return {ResultStatus::ErrorAlreadyLoaded, {}}; } @@ -65,7 +66,7 @@ AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process) { return {nca_status, {}}; } - const auto result = nca_loader->Load(process); + const auto result = nca_loader->Load(process, system); if (result.first != ResultStatus::Success) { return result; } |