diff options
| author | 2020-09-16 08:19:25 -0400 | |
|---|---|---|
| committer | 2020-09-16 08:46:59 -0400 | |
| commit | 113a3972a6487430ab94f08a4a66742739ff48c2 (patch) | |
| tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nca.h | |
| parent | Merge pull request #4658 from lioncash/copy3 (diff) | |
| download | yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.tar.gz yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.tar.xz yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.zip | |
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.h')
| -rw-r--r-- | src/core/loader/nca.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/loader/nca.h b/src/core/loader/nca.h index e47dc0e47..711070294 100644 --- a/src/core/loader/nca.h +++ b/src/core/loader/nca.h | |||
| @@ -8,6 +8,10 @@ | |||
| 8 | #include "core/file_sys/vfs.h" | 8 | #include "core/file_sys/vfs.h" |
| 9 | #include "core/loader/loader.h" | 9 | #include "core/loader/loader.h" |
| 10 | 10 | ||
| 11 | namespace Core { | ||
| 12 | class System; | ||
| 13 | } | ||
| 14 | |||
| 11 | namespace FileSys { | 15 | namespace FileSys { |
| 12 | class NCA; | 16 | class NCA; |
| 13 | } | 17 | } |
| @@ -33,7 +37,7 @@ public: | |||
| 33 | return IdentifyType(file); | 37 | return IdentifyType(file); |
| 34 | } | 38 | } |
| 35 | 39 | ||
| 36 | LoadResult Load(Kernel::Process& process) override; | 40 | LoadResult Load(Kernel::Process& process, Core::System& system) override; |
| 37 | 41 | ||
| 38 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 42 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; |
| 39 | u64 ReadRomFSIVFCOffset() const override; | 43 | u64 ReadRomFSIVFCOffset() const override; |