From 62c671e8232d88591270cc69a8a8c5279db2a983 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 9 Dec 2023 17:46:16 -0600
Subject: [PATCH] [nostalgia/core] Cleanup on TileSheet

---
 .../modules/core/include/nostalgia/core/tilesheet.hpp      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
index 55c6d302..f8509ba8 100644
--- a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
+++ b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
@@ -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)