From c4eede9767f608a8475e7578fe22aa429e53e664 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Fri, 12 Jul 2024 22:32:12 +0200 Subject: [PATCH] Move CS_SPRITE_FONT_OFFSET to Font.cpp, its only user --- src/openrct2/drawing/Font.cpp | 2 ++ src/openrct2/localisation/FormatCodes.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index c1c3a3829c..c69ffd24a9 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -35,6 +35,8 @@ static uint8_t _additionalSpriteFontCharacterWidth[FontStyleCount][SPR_G2_GLYPH_ TTFFontSetDescriptor* gCurrentTTFFontSet; #endif // NO_TTF +constexpr uint8_t CS_SPRITE_FONT_OFFSET = 32; + static const std::unordered_map codepointOffsetMap = { { UnicodeChar::ae_uc, SPR_G2_AE_UPPER - SPR_CHAR_START }, { UnicodeChar::o_stroke_uc, SPR_G2_O_STROKE_UPPER - SPR_CHAR_START }, diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index d6643e5c42..57e8842d74 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -82,8 +82,6 @@ bool FormatTokenIsColour(FormatToken token); size_t FormatTokenGetTextColourIndex(FormatToken token); FormatToken FormatTokenFromTextColour(size_t textColour); -constexpr uint8_t CS_SPRITE_FONT_OFFSET = 32; - namespace CSChar { constexpr char32_t quote_close = 0x22;