[nostalgia/core] Cleanup, add missing FileAddress wrapper function

src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp

@@ -143,6 +143,14 @@ ox::Error loadBgTileSheet(
 		size_t srcTileIdx,
 		size_t tileCnt) noexcept;
 
+ox::Error loadBgTileSheet(
+		Context &ctx,
+		unsigned cbb,
+		ox::FileAddress const&tsAddr,
+		size_t dstTileIdx,
+		size_t srcTileIdx,
+		size_t tileCnt) noexcept;
+
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,

src/nostalgia/modules/core/src/gba/gfx.cpp

@@ -61,21 +61,6 @@ ox::Error loadSpritePalette(
 	return {};
 }
 
-ox::Error loadBgPalette(
-		Context &ctx,
-		size_t palBank,
-		ox::FileAddress const&paletteAddr) noexcept {
-	oxRequire(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
-	return loadBgPalette(ctx, palBank, *pal, 0);
-}
-
-ox::Error loadSpritePalette(
-		Context &ctx,
-		ox::FileAddress const&paletteAddr) noexcept {
-	oxRequire(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
-	return loadSpritePalette(ctx, *pal, 0);
-}
-
 static ox::Error loadTileSheetSet(
 		Context &ctx,
 		ox::Span<uint16_t> tileMapTargetMem,
@@ -156,15 +141,6 @@ ox::Error loadBgTileSheet(
 	return {};
 }
 
-ox::Error loadBgTileSheet(
-		Context &ctx,
-		unsigned cbb,
-		ox::FileAddress const&tilesheetAddr,
-		ox::Optional<unsigned> const&paletteBank) noexcept {
-	oxRequire(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
-	return loadBgTileSheet(ctx, cbb, *ts, paletteBank);
-}
-
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned const cbb,
@@ -206,14 +182,6 @@ ox::Error loadSpriteTileSheet(
 	return {};
 }
 
-ox::Error loadSpriteTileSheet(
-		Context &ctx,
-		ox::FileAddress const&tilesheetAddr,
-		bool loadDefaultPalette) noexcept {
-	oxRequire(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
-	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
-}
-
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		TileSheetSet const&set) noexcept {

src/nostalgia/modules/core/src/gfx.cpp

@@ -2,6 +2,7 @@
  * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#include <keel/media.hpp>
 #include <nostalgia/core/gfx.hpp>
 
 namespace nostalgia::core {
@@ -17,6 +18,49 @@ int tileRows(Context&) noexcept {
 	return GbaTileRows;
 }
 
+ox::Error loadBgPalette(
+		Context &ctx,
+		size_t palBank,
+		ox::FileAddress const&paletteAddr) noexcept {
+	oxRequire(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
+	return loadBgPalette(ctx, palBank, *pal, 0);
+}
+
+ox::Error loadSpritePalette(
+		Context &ctx,
+		ox::FileAddress const&paletteAddr) noexcept {
+	oxRequire(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
+	return loadSpritePalette(ctx, *pal, 0);
+}
+
+ox::Error loadBgTileSheet(
+		Context &ctx,
+		unsigned cbb,
+		ox::FileAddress const&tsAddr,
+		size_t dstTileIdx,
+		size_t srcTileIdx,
+		size_t tileCnt) noexcept {
+	oxRequire(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tsAddr));
+	return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt);
+}
+
+ox::Error loadBgTileSheet(
+		Context &ctx,
+		unsigned cbb,
+		ox::FileAddress const&tilesheetAddr,
+		ox::Optional<unsigned> const&paletteBank) noexcept {
+	oxRequire(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
+	return loadBgTileSheet(ctx, cbb, *ts, paletteBank);
+}
+
+ox::Error loadSpriteTileSheet(
+		Context &ctx,
+		ox::FileAddress const&tilesheetAddr,
+		bool loadDefaultPalette) noexcept {
+	oxRequire(ts, readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
+	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
+}
+
 // map ASCII values to the nostalgia charset
 constexpr ox::Array<char, 128> charMap = {
 	0,

src/nostalgia/modules/core/src/opengl/gfx.cpp

@@ -531,26 +531,6 @@ ox::Error loadSpritePalette(
 	return {};
 }
 
-ox::Error loadBgPalette(
-		Context &ctx,
-		size_t palBank,
-		ox::FileAddress const&paletteAddr) noexcept {
-	auto &kctx = keelCtx(ctx.turbineCtx);
-	oxRequire(palette, readObj<CompactPalette>(kctx, paletteAddr));
-	renderer::loadPalette(ctx.bgPalette, palBank * 16 * 4, ctx.bgShader, *palette);
-	return {};
-}
-
-ox::Error loadSpritePalette(
-		Context &ctx,
-		ox::FileAddress const&paletteAddr) noexcept {
-	auto &kctx = keelCtx(ctx.turbineCtx);
-	oxRequire(palette, readObj<CompactPalette>(kctx, paletteAddr));
-	ox::Array<GLfloat, 1024> pal;
-	renderer::loadPalette(pal, 0, ctx.spriteShader, *palette);
-	return {};
-}
-
 static ox::Result<TileSheetData> buildSetTsd(
 		Context &ctx,
 		TileSheetSet const&set) noexcept {
@@ -630,16 +610,6 @@ ox::Error loadBgTileSheet(
 	return {};
 }
 
-ox::Error loadBgTileSheet(
-		Context &ctx,
-		uint_t cbb,
-		ox::FileAddress const&tilesheetAddr,
-		ox::Optional<unsigned> const&paletteBank) noexcept {
-	auto &kctx = keelCtx(ctx.turbineCtx);
-	oxRequire(ts, readObj<CompactTileSheet>(kctx, tilesheetAddr));
-	return loadBgTileSheet(ctx, cbb, *ts, paletteBank);
-}
-
 ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
@@ -662,15 +632,6 @@ ox::Error loadSpriteTileSheet(
 	return {};
 }
 
-ox::Error loadSpriteTileSheet(
-		Context &ctx,
-		ox::FileAddress const&tilesheetAddr,
-		bool loadDefaultPalette) noexcept {
-	auto &kctx = keelCtx(ctx.turbineCtx);
-	oxRequire(ts, readObj<CompactTileSheet>(kctx, tilesheetAddr));
-	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
-}
-
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		TileSheetSet const&set) noexcept {

src/olympic/keel/include/keel/media.hpp

@@ -29,8 +29,8 @@ oxModelBegin(PreloadPtr)
 	oxModelField(preloadAddr)
 oxModelEnd()
 
-ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::FileAddress const&file) noexcept;
+ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::FileAddress const&addr) noexcept;
-ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::StringViewCR file) noexcept;
+ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::StringViewCR path) noexcept;
 
 
 void createUuidMapping(Context &ctx, ox::StringView filePath, ox::UUID const&uuid) noexcept;

src/olympic/keel/src/media.cpp

@@ -208,15 +208,15 @@ void unloadRom(char*) noexcept {
 
 ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::StringViewCR path) noexcept {
 	oxRequire(stat, ctx.rom->stat(path));
-	oxRequire(buff, static_cast<ox::MemFS*>(ctx.rom.get())->directAccess(path));
+	oxRequire(buff, static_cast<ox::MemFS&>(*ctx.rom).directAccess(path));
 	PreloadPtr p;
 	oxReturnError(ox::readMC({buff, static_cast<std::size_t>(stat.size)}, p));
 	return static_cast<std::size_t>(p.preloadAddr) + ctx.preloadSectionOffset;
 }
 
-ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::FileAddress const&file) noexcept {
+ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::FileAddress const&addr) noexcept {
-	oxRequire(stat, ctx.rom->stat(file));
+	oxRequire(stat, ctx.rom->stat(addr));
-	oxRequire(buff, static_cast<ox::MemFS*>(ctx.rom.get())->directAccess(file));
+	oxRequire(buff, static_cast<ox::MemFS&>(*ctx.rom).directAccess(addr));
 	PreloadPtr p;
 	oxReturnError(ox::readMC({buff, static_cast<std::size_t>(stat.size)}, p));
 	return static_cast<std::size_t>(p.preloadAddr) + ctx.preloadSectionOffset;