drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[nostalgia/core] Make loadRomFs return UniquePtr

Browse Source
This commit is contained in:
Gary Talent
2021-04-20 22:12:37 -05:00
parent abf45112b0
commit 4cd8f6a0c1
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/core/media.cpp
+3 -3
View File
@@ -10,15 +10,15 @@
namespace nostalgia::core {
ox::Result<ox::FileSystem*> loadRomFs(const char *path) noexcept {
ox::Result<ox::UniquePtr<ox::FileSystem>> loadRomFs(const char *path) noexcept {
const auto lastDot = ox_lastIndexOf(path, '.');
const auto fsExt = lastDot != -1 ? path + lastDot : "";
if (ox_strcmp(fsExt, ".oxfs") == 0) {
oxRequire(rom, core::loadRom(path));
return new ox::FileSystem32(rom, 32 * ox::units::MB, unloadRom);
return {ox::make_unique<ox::FileSystem32>(rom, 32 * ox::units::MB, unloadRom)};
} else {
#ifdef OX_HAS_PASSTHROUGHFS
return new ox::PassThroughFS(path);
return {ox::make_unique<ox::PassThroughFS>(path)};
#else
return OxError(2);
#endif