From c53404ddf9c27fd027644406b6504f37785a4b98 Mon Sep 17 00:00:00 2001 From: jason-mills Date: Tue, 1 Oct 2024 02:07:25 -0700 Subject: [PATCH] Part of #21421: Update Drawing.h with new constant notation (#22864) --- src/openrct2/drawing/Drawing.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index b225349944..475ce68e8a 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -224,6 +224,10 @@ enum INSET_RECT_FLAG_BORDER_INSET = (1 << 5), // 0x20 INSET_RECT_FLAG_FILL_DONT_LIGHTEN = (1 << 6), // 0x40 INSET_RECT_FLAG_FILL_MID_LIGHT = (1 << 7), // 0x80 + + INSET_RECT_F_30 = (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_NONE), + INSET_RECT_F_60 = (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_DONT_LIGHTEN), + INSET_RECT_F_E0 = (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_DONT_LIGHTEN | INSET_RECT_FLAG_FILL_MID_LIGHT), }; enum class FilterPaletteID : int32_t @@ -521,10 +525,6 @@ void FASTCALL BlitPixels(const uint8_t* src, uint8_t* dst, const PaletteMap& pal constexpr uint8_t kPaletteTotalOffsets = 192; -#define INSET_RECT_F_30 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_NONE) -#define INSET_RECT_F_60 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_DONT_LIGHTEN) -#define INSET_RECT_F_E0 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_DONT_LIGHTEN | INSET_RECT_FLAG_FILL_MID_LIGHT) - constexpr int8_t kMaxScrollingTextModes = 38; extern GamePalette gPalette;