From ee7d5c6d5167f3b4f660106fa63f8cfa8a39a9e2 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 17 May 2025 17:22:13 -0500 Subject: [PATCH] [nostalgia/gfx] Cleanup --- src/nostalgia/modules/gfx/src/gfx.cpp | 38 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/nostalgia/modules/gfx/src/gfx.cpp b/src/nostalgia/modules/gfx/src/gfx.cpp index cc3d97e6..89f09689 100644 --- a/src/nostalgia/modules/gfx/src/gfx.cpp +++ b/src/nostalgia/modules/gfx/src/gfx.cpp @@ -20,7 +20,7 @@ int tileRows(Context&) noexcept { ox::Error loadBgPalette( Context &ctx, - size_t palBank, + size_t const palBank, ox::StringViewCR palettePath) noexcept { OX_REQUIRE(pal, keel::readObj(keelCtx(ctx), palettePath)); return loadBgPalette(ctx, palBank, *pal, 0); @@ -28,8 +28,8 @@ ox::Error loadBgPalette( ox::Error loadBgPalette( Context &ctx, - size_t palBank, - ox::FileAddress const&paletteAddr) noexcept { + size_t const palBank, + ox::FileAddress const &paletteAddr) noexcept { OX_REQUIRE(pal, keel::readObj(keelCtx(ctx), paletteAddr)); return loadBgPalette(ctx, palBank, *pal, 0); } @@ -43,18 +43,18 @@ ox::Error loadSpritePalette( ox::Error loadSpritePalette( Context &ctx, - ox::FileAddress const&paletteAddr) noexcept { + ox::FileAddress const &paletteAddr) noexcept { OX_REQUIRE(pal, keel::readObj(keelCtx(ctx), paletteAddr)); return loadSpritePalette(ctx, *pal, 0); } ox::Error loadBgTileSheet( Context &ctx, - unsigned cbb, + unsigned const cbb, ox::FileAddress const&tsAddr, - size_t dstTileIdx, - size_t srcTileIdx, - size_t tileCnt) noexcept { + size_t const dstTileIdx, + size_t const srcTileIdx, + size_t const tileCnt) noexcept { OX_REQUIRE(ts, keel::readObj(keelCtx(ctx), tsAddr)); return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt); } @@ -63,16 +63,16 @@ ox::Error loadBgTileSheet( Context &ctx, unsigned cbb, ox::StringViewCR tsPath, - size_t dstTileIdx, - size_t srcTileIdx, - size_t tileCnt) noexcept { + size_t const dstTileIdx, + size_t const srcTileIdx, + size_t const tileCnt) noexcept { OX_REQUIRE(ts, keel::readObj(keelCtx(ctx), tsPath)); return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt); } ox::Error loadBgTileSheet( Context &ctx, - unsigned cbb, + unsigned const cbb, ox::StringViewCR tilesheetPath, ox::Optional const&paletteBank) noexcept { OX_REQUIRE(ts, keel::readObj(keelCtx(ctx), tilesheetPath)); @@ -81,7 +81,7 @@ ox::Error loadBgTileSheet( ox::Error loadBgTileSheet( Context &ctx, - unsigned cbb, + unsigned const cbb, ox::FileAddress const&tilesheetAddr, ox::Optional const&paletteBank) noexcept { OX_REQUIRE(ts, keel::readObj(keelCtx(ctx), tilesheetAddr)); @@ -91,7 +91,7 @@ ox::Error loadBgTileSheet( ox::Error loadSpriteTileSheet( Context &ctx, ox::StringViewCR tilesheetPath, - bool loadDefaultPalette) noexcept { + bool const loadDefaultPalette) noexcept { OX_REQUIRE(ts, readObj(keelCtx(ctx), tilesheetPath)); return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette); } @@ -99,7 +99,7 @@ ox::Error loadSpriteTileSheet( ox::Error loadSpriteTileSheet( Context &ctx, ox::FileAddress const&tilesheetAddr, - bool loadDefaultPalette) noexcept { + bool const loadDefaultPalette) noexcept { OX_REQUIRE(ts, readObj(keelCtx(ctx), tilesheetAddr)); return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette); } @@ -235,7 +235,13 @@ constexpr ox::Array charMap = { 50, // ~ }; -void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, unsigned tile, unsigned palBank) noexcept { +void setBgTile( + Context &ctx, + uint_t const bgIdx, + int const column, + int const row, + unsigned const tile, + unsigned const palBank) noexcept { setBgTile(ctx, bgIdx, column, row, { .tileIdx = tile, .palBank = palBank,