[nostalgia,olympic] Cleanup

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

@@ -96,7 +96,7 @@ constexpr void repair(TileSheetV2::SubSheet &ss, int bpp) noexcept {
 
 constexpr ox::Error repair(TileSheetV2 &ts) noexcept {
 	if (ts.bpp != 4 && ts.bpp != 8) {
-		return OxError(1, "Unable to repair TileSheet");
+		return ox::Error(1, "Unable to repair TileSheet");
 	}
 	repair(ts.subsheet, ts.bpp);
 	return {};
@@ -166,7 +166,7 @@ constexpr void repair(TileSheetV3::SubSheet &ss, int bpp) noexcept {
 
 constexpr ox::Error repair(TileSheetV3 &ts) noexcept {
 	if (ts.bpp != 4 && ts.bpp != 8) {
-		return OxError(1, "Unable to repair TileSheet");
+		return ox::Error(1, "Unable to repair TileSheet");
 	}
 	repair(ts.subsheet, ts.bpp);
 	return {};
@@ -254,7 +254,7 @@ constexpr void repair(TileSheetV4::SubSheet &ss, int bpp) noexcept {
 
 constexpr ox::Error repair(TileSheetV4 &ts) noexcept {
 	if (ts.bpp != 4 && ts.bpp != 8) {
-		return OxError(1, "Unable to repair TileSheet");
+		return ox::Error(1, "Unable to repair TileSheet");
 	}
 	repair(ts.subsheet, ts.bpp);
 	return {};

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

@@ -72,7 +72,7 @@ static ox::Error loadTileSheetSet(
 	for (auto const&entry : set.entries) {
 		oxRequire(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), entry.tilesheet));
 		if (set.bpp != ts->bpp && ts->bpp == 8) {
-			return OxError(1, "cannot load an 8 BPP tilesheet into a 4 BPP CBB");
+			return ox::Error(1, "cannot load an 8 BPP tilesheet into a 4 BPP CBB");
 		}
 		for (auto const&s : entry.sections) {
 			auto const cnt = (static_cast<size_t>(s.tiles) * PixelsPerTile) >> bppMod;

src/nostalgia/modules/core/src/keel/keelmodule.cpp

@@ -81,9 +81,9 @@ static class: public keel::Module {
 				[](keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) -> ox::Result<bool> {
 					if (typeId == ox::ModelTypeId_v<NostalgiaPalette> ||
 					    typeId == ox::ModelTypeId_v<PaletteV1> ||
-						typeId == ox::ModelTypeId_v<PaletteV2> ||
-						typeId == ox::ModelTypeId_v<PaletteV3> ||
-						typeId == ox::ModelTypeId_v<PaletteV4>) {
+					    typeId == ox::ModelTypeId_v<PaletteV2> ||
+					    typeId == ox::ModelTypeId_v<PaletteV3> ||
+					    typeId == ox::ModelTypeId_v<PaletteV4>) {
 						oxReturnError(keel::convertBuffToBuff<CompactPalette>(
 								ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
 						return true;

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

@@ -586,7 +586,7 @@ ox::Error loadBgTileSheet(
 	auto const srcPxIdx = srcTileIdx * PixelsPerTile;
 	auto const dstPxIdx = dstTileIdx * PixelsPerTile;
 	if (dstPxIdx + pxlCnt >= cbbPxls.size()) {
-		return OxError(1, "video mem dst overflow");
+		return ox::Error(1, "video mem dst overflow");
 	}
 	auto const dst = ox::Span{cbbPxls} + dstPxIdx;
 	copyPixels(ts, dst, srcPxIdx, pxlCnt);

src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp

@@ -76,7 +76,7 @@ static ox::Error toPngFile(
 		c = color32(color(pal, page, c)) | static_cast<Color32>(0XFF << 24);
 	}
 	constexpr auto fmt = LCT_RGBA;
-	return OxError(static_cast<ox::ErrorCode>(
+	return ox::Error(static_cast<ox::ErrorCode>(
 			lodepng_encode_file(
 					path.c_str(),
 					reinterpret_cast<uint8_t const*>(pixels.data()),

src/nostalgia/modules/core/src/tilesheet.cpp

@@ -144,7 +144,7 @@ static ox::Error setPixelCount(ox::Vector<uint8_t> &pixels, int8_t pBpp, std::si
 			sz = cnt;
 			break;
 		default:
-			return OxError(1, "Invalid pBpp used for TileSheet::SubSheet::setPixelCount");
+			return ox::Error(1, "Invalid pBpp used for TileSheet::SubSheet::setPixelCount");
 	}
 	pixels.reserve(sz);
 	pixels.resize(sz);
@@ -187,7 +187,7 @@ ox::Result<ox::StringView> getNameFor(TileSheet::SubSheet const&ss, SubSheetId p
 			return name;
 		}
 	}
-	return OxError(1, "SubSheet not found");
+	return ox::Error(1, "SubSheet not found");
 }
 
 
@@ -256,7 +256,7 @@ ox::Error addSubSheet(TileSheet &ts, TileSheet::SubSheetIdx const&idx) noexcept
 		parent.subsheets.emplace_back(++ts.idIt, "Subsheet 0", parent.columns, parent.rows, ts.bpp);
 		parent.subsheets.emplace_back(++ts.idIt, "Subsheet 1", 1, 1, ts.bpp);
 	}
-	return OxError(0);
+	return ox::Error(0);
 }
 
 ox::Error rmSubSheet(
@@ -345,7 +345,7 @@ static ox::Result<SubSheetId> getIdFor(
 			return getIdFor(ss, pNamePath, pIt + 1);
 		}
 	}
-	return OxError(1, "SubSheet not found");
+	return ox::Error(1, "SubSheet not found");
 }
 
 ox::Result<SubSheetId> getIdFor(TileSheet const&ts, ox::StringViewCR path) noexcept {
@@ -363,7 +363,7 @@ static ox::Result<unsigned> getTileOffset(
 		unsigned pCurrentTotal = 0) noexcept {
 	// pIt == pNamePath.size() - 1 &&
 	if (ss.name != pNamePath[pIt]) {
-		return OxError(2, "Wrong branch");
+		return ox::Error(2, "Wrong branch");
 	}
 	if (pIt == pNamePath.size() - 1) {
 		return pCurrentTotal;
@@ -376,7 +376,7 @@ static ox::Result<unsigned> getTileOffset(
 		}
 		pCurrentTotal += pixelCnt(sub, pBpp) / PixelsPerTile;
 	}
-	return OxError(1, "SubSheet not found");
+	return ox::Error(1, "SubSheet not found");
 }
 
 ox::Result<unsigned> getTileOffset(TileSheet const&ts, ox::StringViewCR pNamePath) noexcept {

src/nostalgia/modules/scene/src/scene.cpp

@@ -14,7 +14,7 @@ Scene::Scene(SceneStatic const&sceneStatic) noexcept:
 
 ox::Error Scene::setupDisplay(core::Context &ctx) const noexcept {
 	if (m_sceneStatic.palettes.empty()) {
-		return OxError(1, "Scene has no palettes");
+		return ox::Error(1, "Scene has no palettes");
 	}
 	auto const&palette = m_sceneStatic.palettes[0];
 	oxReturnError(core::loadBgTileSheet(ctx, 0, m_sceneStatic.tilesheet));

src/nostalgia/player/app.cpp

@@ -163,7 +163,7 @@ ox::Error run(
 		[[maybe_unused]] ox::StringView projectDataDir,
 		ox::SpanView<char const*> args) noexcept {
 	if (args.size() < 2) {
-		return OxError(1, "Please provide path to project directory or OxFS file.");
+		return ox::Error(1, "Please provide path to project directory or OxFS file.");
 	}
 	auto const path = args[1];
 	oxRequireM(fs, keel::loadRomFs(path));