[nostalgia/core] Cleanup on TileSheet

This commit is contained in:
Gary Talent 2023-12-09 17:46:16 -06:00
parent 0ac494998f
commit 62c671e823

View File

@ -174,19 +174,16 @@ struct TileSheet {
/**
* Gets the offset in tiles of the desired subsheet.
*/
[[nodiscard]]
ox::Result<unsigned> getTileOffset(
ox::SpanView<ox::StringView> const&pNamePath,
int8_t pBpp,
std::size_t pIt = 0,
unsigned pCurrentTotal = 0) const noexcept;
[[nodiscard]]
ox::Result<SubSheetId> getIdFor(
ox::SpanView<ox::StringView> const&pNamePath,
std::size_t pIt = 0) const noexcept;
[[nodiscard]]
ox::Result<ox::StringView> getNameFor(SubSheetId pId) const noexcept;
};
@ -310,7 +307,7 @@ oxModelBegin(TileSheetV2)
oxModelField(subsheet)
oxModelEnd()
oxModelBegin(TileSheet::SubSheet)
oxModelBegin(TileSheetV3::SubSheet)
oxModelField(name);
oxModelField(rows);
oxModelField(columns);
@ -318,7 +315,7 @@ oxModelBegin(TileSheet::SubSheet)
oxModelField(pixels)
oxModelEnd()
oxModelBegin(TileSheet)
oxModelBegin(TileSheetV3)
oxModelField(bpp)
oxModelField(idIt)
oxModelField(defaultPalette)