drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/core] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2023-06-03 23:45:20 -05:00
parent 2887fa7819
commit 1bff41d9f1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nostalgia/core/context.hpp
View File

@ -26,6 +26,7 @@ class Context {
Context(const Context &other) noexcept = delete; Context(const Context &other) noexcept = delete;
Context(const Context &&other) noexcept = delete; Context(const Context &&other) noexcept = delete;
[[nodiscard]]
const auto &rom() const noexcept { const auto &rom() const noexcept {
return *turbineCtx->rom; return *turbineCtx->rom;
} }

4
src/nostalgia/core/gba/gfx.cpp
View File

@ -104,8 +104,8 @@ ox::Error initConsole(Context *ctx) noexcept {
if (!ctx) { if (!ctx) {
ctx = new(ox_alloca(sizeof(Context))) Context; ctx = new(ox_alloca(sizeof(Context))) Context;
oxRequire(rom, keel::loadRom()); oxRequire(rom, keel::loadRom());
ox::FileStore32 fs(rom, 32 * ox::units::MB); auto romFs = new(ox_alloca(sizeof(ox::FileSystem32)))
auto romFs = new(ox_alloca(sizeof(ox::FileSystem32))) ox::FileSystem32(fs); ox::FileSystem32(ox::FileStore32(rom, 32 * ox::units::MB));
oxRequireM(tctx, turbine::init(ox::UPtr<ox::FileSystem>(romFs), "")); oxRequireM(tctx, turbine::init(ox::UPtr<ox::FileSystem>(romFs), ""));
ctx->turbineCtx = tctx.release(); ctx->turbineCtx = tctx.release();
oxReturnError(loadBgTileSheet(ctx, 0, TilesheetAddr, PaletteAddr)); oxReturnError(loadBgTileSheet(ctx, 0, TilesheetAddr, PaletteAddr));