diff options
| author | 2015-09-21 21:14:18 -0400 | |
|---|---|---|
| committer | 2015-09-21 21:14:18 -0400 | |
| commit | b58a48d7964a30d3c334a7eaf41c658579c37638 (patch) | |
| tree | 2b2ec9ae8db37137e5fd9c2a6c93f7d7c38984b7 /src/core/loader/loader.cpp | |
| parent | Merge pull request #1097 from yuriks/cfg-blocks (diff) | |
| parent | Implement 3dsx RomFS (diff) | |
| download | yuzu-b58a48d7964a30d3c334a7eaf41c658579c37638.tar.gz yuzu-b58a48d7964a30d3c334a7eaf41c658579c37638.tar.xz yuzu-b58a48d7964a30d3c334a7eaf41c658579c37638.zip | |
Merge pull request #1167 from Cruel/master
Implement 3dsx RomFS
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 74eb6e871..c4b4f5a5d 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -116,7 +116,15 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 116 | 116 | ||
| 117 | //3DSX file format... | 117 | //3DSX file format... |
| 118 | case FileType::THREEDSX: | 118 | case FileType::THREEDSX: |
| 119 | return AppLoader_THREEDSX(std::move(file), filename_filename).Load(); | 119 | { |
| 120 | AppLoader_THREEDSX app_loader(std::move(file), filename_filename, filename); | ||
| 121 | // Load application and RomFS | ||
| 122 | if (ResultStatus::Success == app_loader.Load()) { | ||
| 123 | Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); | ||
| 124 | return ResultStatus::Success; | ||
| 125 | } | ||
| 126 | break; | ||
| 127 | } | ||
| 120 | 128 | ||
| 121 | // Standard ELF file format... | 129 | // Standard ELF file format... |
| 122 | case FileType::ELF: | 130 | case FileType::ELF: |