mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Close #12087: Use ScreenCoordsXY on gfx_filter_pixel (#12102)

This commit is contained in:
annoyingdroid 2020-07-02 10:08:46 -04:00 committed by GitHub
parent 08f71f79d4
commit 5056872676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/Tooltip.cpp
View File

@ -203,10 +203,10 @@ static void window_tooltip_paint(rct_window* w, rct_drawpixelinfo* dpi)
gfx_filter_rect(dpi, left + 2, top + 0, right - 2, top + 0, PALETTE_DARKEN_3);
// Corners
gfx_filter_pixel(dpi, left + 1, top + 1, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, right - 1, top + 1, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, left + 1, bottom - 1, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, right - 1, bottom - 1, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, { left + 1, top + 1 }, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, { right - 1, top + 1 }, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, { left + 1, bottom - 1 }, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, { right - 1, bottom - 1 }, PALETTE_DARKEN_3);
// Text
left = w->windowPos.x + ((w->width + 1) / 2) - 1;

4
src/openrct2/drawing/Drawing.cpp
View File

@ -583,9 +583,9 @@ void gfx_draw_pixel(rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t colour
gfx_fill_rect(dpi, x, y, x, y, colour);
}
void gfx_filter_pixel(rct_drawpixelinfo* dpi, int32_t x, int32_t y, FILTER_PALETTE_ID palette)
void gfx_filter_pixel(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, FILTER_PALETTE_ID palette)
{
gfx_filter_rect(dpi, x, y, x, y, palette);
gfx_filter_rect(dpi, coords.x, coords.y, coords.x, coords.y, palette);
}
/**

2
src/openrct2/drawing/Drawing.h
View File

@ -593,7 +593,7 @@ void load_palette();
// other
void gfx_clear(rct_drawpixelinfo* dpi, uint8_t paletteIndex);
void gfx_draw_pixel(rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t colour);
void gfx_filter_pixel(rct_drawpixelinfo* dpi, int32_t x, int32_t y, FILTER_PALETTE_ID palette);
void gfx_filter_pixel(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, FILTER_PALETTE_ID palette);
void gfx_invalidate_pickedup_peep();
void gfx_draw_pickedup_peep(rct_drawpixelinfo* dpi);