From ffcb2b8c828e9c41bc81403c84c44684de8b844e Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 27 Feb 2024 16:55:53 +0100 Subject: [PATCH] Fix or-ing different enumeration types warning --- src/openrct2-ui/windows/TopToolbar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 44b2c8d3b4..93043edaf0 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -3230,9 +3230,10 @@ public: // Draw an overlay if clearance checks are disabled if (gCheatsDisableClearanceChecks) { + auto colour = static_cast(EnumValue(COLOUR_DARK_ORANGE) | EnumValue(COLOUR_FLAG_OUTLINE)); DrawTextBasic( dpi, screenPos + ScreenCoordsXY{ 26, 2 }, STR_OVERLAY_CLEARANCE_CHECKS_DISABLED, {}, - { COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE, TextAlignment::RIGHT }); + { colour, TextAlignment::RIGHT }); } } @@ -3295,9 +3296,8 @@ public: // Draw number of players. auto ft = Formatter(); ft.Add(NetworkGetNumVisiblePlayers()); - DrawTextBasic( - dpi, screenPos + ScreenCoordsXY{ 23, 1 }, STR_COMMA16, ft, - { COLOUR_WHITE | COLOUR_FLAG_OUTLINE, TextAlignment::RIGHT }); + auto colour = static_cast(EnumValue(COLOUR_WHITE) | EnumValue(COLOUR_FLAG_OUTLINE)); + DrawTextBasic(dpi, screenPos + ScreenCoordsXY{ 23, 1 }, STR_COMMA16, ft, { colour, TextAlignment::RIGHT }); } } };