drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[keel,nostalgia,studio,turbine] Make turbine::Context have a keel::Context instead of being one

Browse Source
This commit is contained in:
Gary Talent
2023-06-20 00:56:55 -05:00
parent d4eaade326
commit c5233e0d1d
24 changed files with 134 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/modules/core/src/gba/context.hpp
View File

@@ -16,7 +16,7 @@ struct GbaContext: public core::Context {
[[nodiscard]]
const auto &rom() const noexcept {
return *turbineCtx->rom;
return *turbine::rom(*turbineCtx);
}
};

16
src/nostalgia/modules/core/src/gba/gfx.cpp
View File

@@ -133,18 +133,20 @@ static ox::Error loadBgTileSheet(
return {};
}
ox::Error loadBgTileSheet(Context *ctx,
unsigned cbb,
const ox::FileAddress &tilesheetAddr,
const ox::FileAddress &paletteAddr) noexcept {
ox::Error loadBgTileSheet(
Context *ctx,
unsigned cbb,
const ox::FileAddress &tilesheetAddr,
const ox::FileAddress &paletteAddr) noexcept {
auto &gctx = static_cast<GbaContext&>(*ctx);
auto &rom = static_cast<const ox::MemFS&>(gctx.rom());
return loadBgTileSheet(rom, cbb, tilesheetAddr, paletteAddr);
}
ox::Error loadSpriteTileSheet(Context *ctx,
const ox::FileAddress &tilesheetAddr,
const ox::FileAddress &paletteAddr) noexcept {
ox::Error loadSpriteTileSheet(
Context *ctx,
const ox::FileAddress &tilesheetAddr,
const ox::FileAddress &paletteAddr) noexcept {
auto &gctx = static_cast<GbaContext&>(*ctx);
oxRequire(tsStat, gctx.rom().stat(tilesheetAddr));
oxRequire(ts, static_cast<const ox::MemFS&>(gctx.rom()).directAccess(tilesheetAddr));