mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Part of #12160: Use Coords for is_sprite_interacted_with (#12207)

Browse Source
This commit is contained in:
frutiemax
2020-07-11 10:55:27 -04:00
committed by GitHub
parent a47ca9d619
commit 76d899c8da
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1558,7 +1558,8 @@ static bool is_sprite_interacted_with_palette_set(
*
* rct2: 0x00679023
*/
static bool is_sprite_interacted_with(rct_drawpixelinfo* dpi, int32_t imageId, int32_t x, int32_t y)
static bool is_sprite_interacted_with(rct_drawpixelinfo* dpi, int32_t imageId, const ScreenCoordsXY& coords)
{
auto paletteMap = PaletteMap::GetDefault();
imageId &= ~IMAGE_TYPE_TRANSPARENT;
@@ -1579,7 +1580,7 @@ static bool is_sprite_interacted_with(rct_drawpixelinfo* dpi, int32_t imageId, i
{
_currentImageType = 0;
}
return is_sprite_interacted_with_palette_set(dpi, imageId, x, y, paletteMap);
return is_sprite_interacted_with_palette_set(dpi, imageId, coords.x, coords.y, paletteMap);
}
/**
@@ -1599,7 +1600,7 @@ InteractionInfo set_interaction_info_from_paint_session(paint_session* session,
while (next_ps != nullptr)
{
ps = next_ps;
if (is_sprite_interacted_with(dpi, ps->image_id, ps->x, ps->y))
if (is_sprite_interacted_with(dpi, ps->image_id, { ps->x, ps->y }))
{
if (PSSpriteTypeIsInFilter(ps, filter))
{
@@ -1612,7 +1613,7 @@ InteractionInfo set_interaction_info_from_paint_session(paint_session* session,
for (attached_paint_struct* attached_ps = ps->attached_ps; attached_ps != nullptr; attached_ps = attached_ps->next)
{
if (is_sprite_interacted_with(
dpi, attached_ps->image_id, (attached_ps->x + ps->x) & 0xFFFF, (attached_ps->y + ps->y) & 0xFFFF))
dpi, attached_ps->image_id, { (attached_ps->x + ps->x) & 0xFFFF, (attached_ps->y + ps->y) & 0xFFFF }))
{
if (PSSpriteTypeIsInFilter(ps, filter))
{