summaryrefslogtreecommitdiff
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar Lioncash2020-09-16 18:29:24 -0400
committerGravatar Lioncash2020-09-16 19:15:19 -0400
commita62c1999c520f88513d9b0cf6e3a5c3a548d51ac (patch)
tree988f711352f4ec0bd56bd4a517a8b2b628fcb9f9 /src/core/loader
parentfile_sys/bis_factory: Eliminate usage of the global system accessor (diff)
downloadyuzu-a62c1999c520f88513d9b0cf6e3a5c3a548d51ac.tar.gz
yuzu-a62c1999c520f88513d9b0cf6e3a5c3a548d51ac.tar.xz
yuzu-a62c1999c520f88513d9b0cf6e3a5c3a548d51ac.zip
file_sys/romfs_factory: Eliminate usage of the global system accessor
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/deconstructed_rom_directory.cpp4
-rw-r--r--src/core/loader/nca.cpp4
-rw-r--r--src/core/loader/nro.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp
index 56dda425c..394a1bf26 100644
--- a/src/core/loader/deconstructed_rom_directory.cpp
+++ b/src/core/loader/deconstructed_rom_directory.cpp
@@ -192,8 +192,8 @@ AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirect
192 // Register the RomFS if a ".romfs" file was found 192 // Register the RomFS if a ".romfs" file was found
193 if (romfs_iter != files.end() && *romfs_iter != nullptr) { 193 if (romfs_iter != files.end() && *romfs_iter != nullptr) {
194 romfs = *romfs_iter; 194 romfs = *romfs_iter;
195 system.GetFileSystemController().RegisterRomFS( 195 system.GetFileSystemController().RegisterRomFS(std::make_unique<FileSys::RomFSFactory>(
196 std::make_unique<FileSys::RomFSFactory>(*this)); 196 *this, system.GetContentProvider(), system.GetFileSystemController()));
197 } 197 }
198 198
199 is_loaded = true; 199 is_loaded = true;
diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp
index 50d7a0f32..fa694de37 100644
--- a/src/core/loader/nca.cpp
+++ b/src/core/loader/nca.cpp
@@ -58,8 +58,8 @@ AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process, Core::Sy
58 } 58 }
59 59
60 if (nca->GetRomFS() != nullptr && nca->GetRomFS()->GetSize() > 0) { 60 if (nca->GetRomFS() != nullptr && nca->GetRomFS()->GetSize() > 0) {
61 system.GetFileSystemController().RegisterRomFS( 61 system.GetFileSystemController().RegisterRomFS(std::make_unique<FileSys::RomFSFactory>(
62 std::make_unique<FileSys::RomFSFactory>(*this)); 62 *this, system.GetContentProvider(), system.GetFileSystemController()));
63 } 63 }
64 64
65 is_loaded = true; 65 is_loaded = true;
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index 5ce279f81..9fb5eddad 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -218,8 +218,8 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process, Core::Sy
218 } 218 }
219 219
220 if (romfs != nullptr) { 220 if (romfs != nullptr) {
221 system.GetFileSystemController().RegisterRomFS( 221 system.GetFileSystemController().RegisterRomFS(std::make_unique<FileSys::RomFSFactory>(
222 std::make_unique<FileSys::RomFSFactory>(*this)); 222 *this, system.GetContentProvider(), system.GetFileSystemController()));
223 } 223 }
224 224
225 is_loaded = true; 225 is_loaded = true;