diff options
| author | 2018-01-20 16:26:20 -0500 | |
|---|---|---|
| committer | 2018-01-20 16:26:20 -0500 | |
| commit | ff883cc56382425d4c4f572ff659ec7df6fc2cec (patch) | |
| tree | 3b7e44f33dac0384d412fed61de3c5ad40db137d /src/core/loader/nro.cpp | |
| parent | Port citra #3352 to yuzu (#103) (diff) | |
| parent | loader: Clean up ctors and includes. (diff) | |
| download | yuzu-ff883cc56382425d4c4f572ff659ec7df6fc2cec.tar.gz yuzu-ff883cc56382425d4c4f572ff659ec7df6fc2cec.tar.xz yuzu-ff883cc56382425d4c4f572ff659ec7df6fc2cec.zip | |
Merge pull request #119 from bunnei/desconstucted-loader
Separate NSO loading from DesconstuctedRomLoader
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 6864a1926..0a087153f 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include <vector> | 5 | #include <vector> |
| 6 | 6 | ||
| 7 | #include "common/common_funcs.h" | 7 | #include "common/common_funcs.h" |
| 8 | #include "common/file_util.h" | ||
| 8 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| 9 | #include "common/swap.h" | 10 | #include "common/swap.h" |
| 10 | #include "core/hle/kernel/process.h" | 11 | #include "core/hle/kernel/process.h" |
| @@ -45,7 +46,10 @@ struct ModHeader { | |||
| 45 | }; | 46 | }; |
| 46 | static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size."); | 47 | static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size."); |
| 47 | 48 | ||
| 48 | FileType AppLoader_NRO::IdentifyType(FileUtil::IOFile& file) { | 49 | AppLoader_NRO::AppLoader_NRO(FileUtil::IOFile&& file, std::string filepath) |
| 50 | : AppLoader(std::move(file)), filepath(std::move(filepath)) {} | ||
| 51 | |||
| 52 | FileType AppLoader_NRO::IdentifyType(FileUtil::IOFile& file, const std::string&) { | ||
| 49 | // Read NSO header | 53 | // Read NSO header |
| 50 | NroHeader nro_header{}; | 54 | NroHeader nro_header{}; |
| 51 | file.Seek(0, SEEK_SET); | 55 | file.Seek(0, SEEK_SET); |