diff options
| author | 2020-09-16 20:59:44 +0000 | |
|---|---|---|
| committer | 2020-09-16 20:59:44 +0000 | |
| commit | b0ae8265ea0aea16bfe37dce96cc3f758fd35feb (patch) | |
| tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nax.h | |
| parent | Merge pull request #4658 from lioncash/copy3 (diff) | |
| parent | core/loader: Remove dependencies on the global system instance (diff) | |
| download | yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.gz yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.xz yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.zip | |
Merge pull request #4661 from lioncash/system-loader
core/loader: Remove dependencies on the global system instance
Diffstat (limited to 'src/core/loader/nax.h')
| -rw-r--r-- | src/core/loader/nax.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/loader/nax.h b/src/core/loader/nax.h index eaec9bf58..c2b7722b5 100644 --- a/src/core/loader/nax.h +++ b/src/core/loader/nax.h | |||
| @@ -8,10 +8,12 @@ | |||
| 8 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 9 | #include "core/loader/loader.h" | 9 | #include "core/loader/loader.h" |
| 10 | 10 | ||
| 11 | namespace FileSys { | 11 | namespace Core { |
| 12 | class System; | ||
| 13 | } | ||
| 12 | 14 | ||
| 15 | namespace FileSys { | ||
| 13 | class NAX; | 16 | class NAX; |
| 14 | |||
| 15 | } // namespace FileSys | 17 | } // namespace FileSys |
| 16 | 18 | ||
| 17 | namespace Loader { | 19 | namespace Loader { |
| @@ -33,7 +35,7 @@ public: | |||
| 33 | 35 | ||
| 34 | FileType GetFileType() const override; | 36 | FileType GetFileType() const override; |
| 35 | 37 | ||
| 36 | LoadResult Load(Kernel::Process& process) override; | 38 | LoadResult Load(Kernel::Process& process, Core::System& system) override; |
| 37 | 39 | ||
| 38 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 40 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; |
| 39 | u64 ReadRomFSIVFCOffset() const override; | 41 | u64 ReadRomFSIVFCOffset() const override; |