1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 02:05:13 +01:00

Merge pull request #10316 from duncanspumpkin/light_fx

Make lights work for all rotations.
This commit is contained in:
Michael Steenbeek
2019-12-04 14:11:26 +01:00
committed by GitHub
3 changed files with 46 additions and 87 deletions

View File

@@ -54,21 +54,12 @@ paint_entry* gNextFreePaintStruct;
uint8_t gCurrentRotation;
static uint32_t _currentImageType;
struct InteractionInfo
InteractionInfo::InteractionInfo(const paint_struct* ps)
: Loc(ps->map_x, ps->map_y)
, Element(ps->tileElement)
, SpriteType(ps->sprite_type)
{
InteractionInfo() = default;
InteractionInfo(const paint_struct* ps)
: Loc(ps->map_x, ps->map_y)
, Element(ps->tileElement)
, SpriteType(ps->sprite_type)
{
}
CoordsXY Loc;
TileElement* Element = nullptr;
uint8_t SpriteType;
};
}
static void viewport_paint_weather_gloom(rct_drawpixelinfo* dpi);
/**
@@ -1566,7 +1557,7 @@ static bool is_sprite_interacted_with(rct_drawpixelinfo* dpi, int32_t imageId, i
*
* rct2: 0x0068862C
*/
static InteractionInfo set_interaction_info_from_paint_session(paint_session* session, uint16_t filter)
InteractionInfo set_interaction_info_from_paint_session(paint_session* session, uint16_t filter)
{
paint_struct* ps = &session->PaintHead;
rct_drawpixelinfo* dpi = &session->DPI;