mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Part of #12096: Prefer ScreenRect on gfx_fill_rect (#12187)

Browse Source
This commit is contained in:
frutiemax
2020-07-09 22:32:38 -04:00
committed by GitHub
parent dbf00956b5
commit 29e6db982b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/drawing/Rect.cpp
View File

@@ -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);
}
}
}

2
src/openrct2/interface/Viewport.cpp
View File

@@ -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);
}
}