diff --git a/src/openrct2/drawing/Rect.cpp b/src/openrct2/drawing/Rect.cpp index 8e80cb94e6..0166a2d7a4 100644 --- a/src/openrct2/drawing/Rect.cpp +++ b/src/openrct2/drawing/Rect.cpp @@ -44,32 +44,32 @@ void gfx_fill_rect_inset( if (flags & INSET_RECT_FLAG_BORDER_NONE) { - gfx_filter_rect(dpi, left, top, right, bottom, palette.base); + gfx_filter_rect(dpi, { { left, top }, { right, bottom } }, palette.base); } else if (flags & INSET_RECT_FLAG_BORDER_INSET) { // Draw outline of box - gfx_filter_rect(dpi, left, top, left, bottom, palette.highlight); - gfx_filter_rect(dpi, left, top, right, top, palette.highlight); - gfx_filter_rect(dpi, right, top, right, bottom, palette.shadow); - gfx_filter_rect(dpi, left, bottom, right, bottom, palette.shadow); + gfx_filter_rect(dpi, { { left, top }, { left, bottom } }, palette.highlight); + gfx_filter_rect(dpi, { { left, top }, { right, top } }, palette.highlight); + gfx_filter_rect(dpi, { { right, top }, { right, bottom } }, palette.shadow); + gfx_filter_rect(dpi, { { left, bottom }, { right, bottom } }, palette.shadow); if (!(flags & INSET_RECT_FLAG_FILL_NONE)) { - gfx_filter_rect(dpi, left + 1, top + 1, right - 1, bottom - 1, palette.base); + gfx_filter_rect(dpi, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, palette.base); } } else { // Draw outline of box - gfx_filter_rect(dpi, left, top, left, bottom, palette.shadow); - gfx_filter_rect(dpi, left, top, right, top, palette.shadow); - gfx_filter_rect(dpi, right, top, right, bottom, palette.highlight); - gfx_filter_rect(dpi, left, bottom, right, bottom, palette.highlight); + gfx_filter_rect(dpi, { { left, top }, { left, bottom } }, palette.shadow); + gfx_filter_rect(dpi, { { left, top }, { right, top } }, palette.shadow); + gfx_filter_rect(dpi, { { right, top }, { right, bottom } }, palette.highlight); + gfx_filter_rect(dpi, { { left, bottom }, { right, bottom } }, palette.highlight); if (!(flags & INSET_RECT_FLAG_FILL_NONE)) { - gfx_filter_rect(dpi, left + 1, top + 1, right - 1, bottom - 1, palette.base); + gfx_filter_rect(dpi, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, palette.base); } } } diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 394e14fe80..b1a7d7b01f 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -1010,7 +1010,7 @@ static void viewport_paint_weather_gloom(rct_drawpixelinfo* dpi) auto paletteId = climate_get_weather_gloom_palette_id(gClimateCurrent); if (paletteId != PALETTE_NULL) { - gfx_filter_rect(dpi, dpi->x, dpi->y, dpi->width + dpi->x - 1, dpi->height + dpi->y - 1, paletteId); + gfx_filter_rect(dpi, { { dpi->x, dpi->y }, { dpi->width + dpi->x - 1, dpi->height + dpi->y - 1 } }, paletteId); } }