diff options
| author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2018-07-18 21:07:11 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-07-18 18:07:11 -0700 |
| commit | 29aff8d5ab46c8d0199aa4bfa7eeff5d4fa2d7ef (patch) | |
| tree | 3202e2ce55ab6387a4ca366a509eccdd963434c3 /src/core/file_sys/romfs_factory.cpp | |
| parent | 924c473bb3a80cf1452949d8c0328912464a6807 (diff) | |
Virtual Filesystem 2: Electric Boogaloo (#676)
* Virtual Filesystem
* Fix delete bug and documentate
* Review fixes + other stuff
* Fix puyo regression
Diffstat (limited to 'src/core/file_sys/romfs_factory.cpp')
| -rw-r--r-- | src/core/file_sys/romfs_factory.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp index 946fc0452..54fbd3267 100644 --- a/src/core/file_sys/romfs_factory.cpp +++ b/src/core/file_sys/romfs_factory.cpp @@ -7,21 +7,19 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "core/file_sys/romfs_factory.h" -#include "core/file_sys/romfs_filesystem.h" namespace FileSys { RomFSFactory::RomFSFactory(Loader::AppLoader& app_loader) { // Load the RomFS from the app - if (Loader::ResultStatus::Success != app_loader.ReadRomFS(romfs_file, data_offset, data_size)) { + if (Loader::ResultStatus::Success != app_loader.ReadRomFS(file)) { LOG_ERROR(Service_FS, "Unable to read RomFS!"); } } -ResultVal<std::unique_ptr<FileSystemBackend>> RomFSFactory::Open(u64 title_id) { +ResultVal<VirtualFile> RomFSFactory::Open(u64 title_id) { // TODO(DarkLordZach): Use title id. - auto archive = std::make_unique<RomFS_FileSystem>(romfs_file, data_offset, data_size); - return MakeResult<std::unique_ptr<FileSystemBackend>>(std::move(archive)); + return MakeResult<VirtualFile>(file); } } // namespace FileSys |