From e2d0a784f17a86e2bdc2c7f6cd713dfc65c562fe Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 26 Dec 2023 18:36:51 -0600 Subject: [PATCH] [olympic/keel] Cleanup --- src/nostalgia/modules/core/src/keel/keelmodule.cpp | 10 +++++----- src/olympic/keel/include/keel/typeconv.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nostalgia/modules/core/src/keel/keelmodule.cpp b/src/nostalgia/modules/core/src/keel/keelmodule.cpp index cf4fb0c0..a91d0e57 100644 --- a/src/nostalgia/modules/core/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/core/src/keel/keelmodule.cpp @@ -41,7 +41,7 @@ class KeelModule: public keel::Module { } [[nodiscard]] - ox::Vector converters() const noexcept final { + ox::Vector converters() const noexcept final { return { &m_nostalgiaPaletteToPaletteConverter, &m_tileSheetV1ToTileSheetV2Converter, @@ -57,12 +57,12 @@ class KeelModule: public keel::Module { // convert tilesheets to CompactTileSheets [](keel::Context &ctx, ox::Buffer &buff) -> ox::Error { oxRequire(hdr, keel::readAssetHeader(buff)); - const auto typeId = ox::buildTypeId( + auto const typeId = ox::buildTypeId( hdr.clawHdr.typeName, hdr.clawHdr.typeVersion, hdr.clawHdr.typeParams); if (typeId == ox::buildTypeId() || - typeId == ox::buildTypeId() || - typeId == ox::buildTypeId() || - typeId == ox::buildTypeId()) { + typeId == ox::buildTypeId() || + typeId == ox::buildTypeId() || + typeId == ox::buildTypeId()) { oxReturnError(keel::convertBuffToBuff( ctx, buff, ox::ClawFormat::Metal).moveTo(buff)); } diff --git a/src/olympic/keel/include/keel/typeconv.hpp b/src/olympic/keel/include/keel/typeconv.hpp index d58600a2..f9124380 100644 --- a/src/olympic/keel/include/keel/typeconv.hpp +++ b/src/olympic/keel/include/keel/typeconv.hpp @@ -148,7 +148,7 @@ ox::Error convert(keel::Context &ctx, ox::Buffer const&buff, DstType *outObj) no } template -ox::Result convertBuffToBuff(keel::Context &ctx, const ox::Buffer &srcBuffer, ox::ClawFormat fmt) noexcept { +ox::Result convertBuffToBuff(keel::Context &ctx, ox::Buffer const&srcBuffer, ox::ClawFormat fmt) noexcept { static constexpr auto DstTypeName = ox::requireModelTypeName(); static constexpr auto DstTypeVersion = ox::requireModelTypeVersion(); oxRequire(out, convert(ctx, srcBuffer, DstTypeName, DstTypeVersion));