From c296c35f3995a86925d93eed8746efccc1a46a00 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 27 Feb 2021 12:49:14 +0100 Subject: [PATCH] Use colour_t for colours enum --- src/openrct2/drawing/Text.h | 3 ++- src/openrct2/interface/Colour.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index ed78f35fb4..b5ffc77620 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -10,6 +10,7 @@ #pragma once #include "../common.h" +#include "../interface/Colour.h" #include "Font.h" struct ScreenCoordsXY; @@ -31,7 +32,7 @@ enum class TextUnderline struct TextPaint { - uint8_t Colour = 0; + colour_t Colour = COLOUR_BLACK; FontSpriteBase SpriteBase = FontSpriteBase::SMALL; TextUnderline UnderlineText = TextUnderline::Off; TextAlignment Alignment = TextAlignment::LEFT; diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index 86d54562d0..44dd0e3719 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -17,7 +17,7 @@ /** * Colour IDs as used by the colour dropdown, NOT palette indices. */ -enum +enum : colour_t { COLOUR_BLACK, COLOUR_GREY,