diff options
| author |  bunnei | 2015-07-16 18:08:46 -0400 |
|---|---|---|
| committer | bunnei | 2015-07-16 18:08:46 -0400 |
| commit | 946f0ee2f4f5e150167ad90f86a425b50baec144 (patch) | |
| tree | 47586aae7237dddc7278ef5e579cf82ad1b64e11 /src/core/loader/3dsx.cpp | |
| parent | Merge pull request #931 from neobrain/move_default_attr_handler (diff) | |
| parent | Loader: Fix variable type and remove unused variable (diff) | |
| download | yuzu-946f0ee2f4f5e150167ad90f86a425b50baec144.tar.gz yuzu-946f0ee2f4f5e150167ad90f86a425b50baec144.tar.xz yuzu-946f0ee2f4f5e150167ad90f86a425b50baec144.zip | |
Merge pull request #918 from yuriks/romfs
Do not load entire RomFS to memory, read from the file as needed instead (rebased)
Diffstat (limited to 'src/core/loader/3dsx.cpp')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 055661363..d043fa9bd 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp | |||
| @@ -246,11 +246,11 @@ ResultStatus AppLoader_THREEDSX::Load() { | |||
| 246 | if (is_loaded) | 246 | if (is_loaded) |
| 247 | return ResultStatus::ErrorAlreadyLoaded; | 247 | return ResultStatus::ErrorAlreadyLoaded; |
| 248 | 248 | ||
| 249 | if (!file->IsOpen()) | 249 | if (!file.IsOpen()) |
| 250 | return ResultStatus::Error; | 250 | return ResultStatus::Error; |
| 251 | 251 | ||
| 252 | SharedPtr<CodeSet> codeset; | 252 | SharedPtr<CodeSet> codeset; |
| 253 | if (Load3DSXFile(*file, Memory::PROCESS_IMAGE_VADDR, &codeset) != ERROR_NONE) | 253 | if (Load3DSXFile(file, Memory::PROCESS_IMAGE_VADDR, &codeset) != ERROR_NONE) |
| 254 | return ResultStatus::Error; | 254 | return ResultStatus::Error; |
| 255 | codeset->name = filename; | 255 | codeset->name = filename; |
| 256 | 256 | ||