mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Create enum for TextColour

Browse Source
This commit is contained in:
Michael Steenbeek
2025-05-11 22:37:21 +02:00
committed by GitHub
parent c17a3fed82
commit 1a571cd4e4
19 changed files with 111 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/drawing/Drawing.String.cpp
View File

@@ -271,13 +271,13 @@ void GfxDrawStringLeftCentred(
/**
* Changes the palette so that the next character changes colour
*/
static void ColourCharacter(uint8_t colour, const uint16_t* current_font_flags, uint8_t* palette_pointer)
static void ColourCharacter(TextColour colour, const uint16_t* current_font_flags, uint8_t* palette_pointer)
{
int32_t colour32 = 0;
const G1Element* g1 = GfxGetG1Element(SPR_TEXT_PALETTE);
if (g1 != nullptr)
{
uint32_t idx = (colour & 0xFF) * 4;
uint32_t idx = EnumValue(colour) * 4;
std::memcpy(&colour32, &g1->offset[idx], sizeof(colour32));
}
@@ -608,8 +608,8 @@ static void TTFProcessFormatCode(RenderTarget& rt, const FmtString::Token& token
if (FormatTokenIsColour(token.kind))
{
uint16_t flags = info->flags;
auto colourIndex = FormatTokenGetTextColourIndex(token.kind);
ColourCharacter(static_cast<uint8_t>(colourIndex), &flags, info->palette);
auto colourIndex = FormatTokenToTextColour(token.kind);
ColourCharacter(colourIndex, &flags, info->palette);
}
break;
}