diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 2aced4a944..6337c700a9 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -87,22 +87,22 @@ namespace OpenRCT2::Ui screenCoords, EnumsToFlags( ViewportInteractionItem::Entity, ViewportInteractionItem::Ride, ViewportInteractionItem::ParkEntrance)); - auto tileElement = info.SpriteType != ViewportInteractionItem::Entity ? info.Element : nullptr; - // Only valid when info.SpriteType == ViewportInteractionItem::Entity, but can't assign nullptr without compiler + auto tileElement = info.interactionType != ViewportInteractionItem::Entity ? info.Element : nullptr; + // Only valid when info.interactionType == ViewportInteractionItem::Entity, but can't assign nullptr without compiler // complaining auto sprite = info.Entity; // Allows only balloons to be popped and ducks to be quacked in title screen if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) { - if (info.SpriteType == ViewportInteractionItem::Entity && (sprite->Is() || sprite->Is())) + if (info.interactionType == ViewportInteractionItem::Entity && (sprite->Is() || sprite->Is())) return info; - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Entity: switch (sprite->Type) @@ -113,7 +113,7 @@ namespace OpenRCT2::Ui if (vehicle != nullptr && !vehicle->IsCableLift()) vehicle->SetMapToolbar(); else - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; } break; case EntityType::Guest: @@ -126,7 +126,7 @@ namespace OpenRCT2::Ui } else { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; } } break; @@ -150,18 +150,18 @@ namespace OpenRCT2::Ui break; } default: - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; break; } // If nothing is under cursor, find a close by peep - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { auto peep = ViewportInteractionGetClosestPeep(screenCoords, 32); if (peep != nullptr) { info.Entity = peep; - info.SpriteType = ViewportInteractionItem::Entity; + info.interactionType = ViewportInteractionItem::Entity; info.Loc.x = peep->x; info.Loc.y = peep->y; PeepSetMapTooltip(peep); @@ -175,7 +175,7 @@ namespace OpenRCT2::Ui { auto info = ViewportInteractionGetItemLeft(screenCoords); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Entity: case ViewportInteractionItem::Ride: @@ -190,7 +190,7 @@ namespace OpenRCT2::Ui { auto info = ViewportInteractionGetItemLeft(screenCoords); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Entity: { @@ -275,21 +275,21 @@ namespace OpenRCT2::Ui info = GetMapCoordinatesFromPos(screenCoords, flags); auto tileElement = info.Element; - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Entity: { auto sprite = info.Entity; if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || sprite->Type != EntityType::Vehicle) { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } auto vehicle = sprite->As(); if (vehicle == nullptr) { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } ride = GetRide(vehicle->ride); @@ -306,19 +306,19 @@ namespace OpenRCT2::Ui { if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } if (tileElement->GetType() == TileElementType::Path) { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } ride = GetRide(tileElement->GetRideIndex()); if (ride == nullptr) { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } @@ -373,7 +373,7 @@ namespace OpenRCT2::Ui // FIXME: Why does it *2 the value? if (!GetGameState().Cheats.SandboxMode && !MapIsLocationOwned({ info.Loc, tileElement->GetBaseZ() * 2 })) { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } @@ -464,13 +464,13 @@ namespace OpenRCT2::Ui if (WindowFindByClass(WindowClass::RideConstruction) == nullptr && WindowFindByClass(WindowClass::Footpath) == nullptr) { - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } } auto ft = Formatter(); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Scenery: { @@ -533,7 +533,7 @@ namespace OpenRCT2::Ui break; } - info.SpriteType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::None; return info; } @@ -541,7 +541,7 @@ namespace OpenRCT2::Ui { auto info = ViewportInteractionGetItemRight(screenCoords); - return info.SpriteType != ViewportInteractionItem::None; + return info.interactionType != ViewportInteractionItem::None; } /** @@ -553,7 +553,7 @@ namespace OpenRCT2::Ui CoordsXYE tileElement; auto info = ViewportInteractionGetItemRight(screenCoords); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::None: case ViewportInteractionItem::Terrain: @@ -791,14 +791,14 @@ namespace OpenRCT2::Ui window, screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water)); auto initialPos = info.Loc; - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { initialPos.SetNull(); return initialPos; } int16_t waterHeight = 0; - if (info.SpriteType == ViewportInteractionItem::Water) + if (info.interactionType == ViewportInteractionItem::Water) { waterHeight = info.Element->AsSurface()->GetWaterHeight(); } @@ -809,7 +809,7 @@ namespace OpenRCT2::Ui for (int32_t i = 0; i < 5; i++) { int16_t z = waterHeight; - if (info.SpriteType != ViewportInteractionItem::Water) + if (info.interactionType != ViewportInteractionItem::Water) { z = TileElementHeight(mapPos); } diff --git a/src/openrct2-ui/interface/ViewportQuery.cpp b/src/openrct2-ui/interface/ViewportQuery.cpp index 9b2e5efb70..b04bbdf6e6 100644 --- a/src/openrct2-ui/interface/ViewportQuery.cpp +++ b/src/openrct2-ui/interface/ViewportQuery.cpp @@ -42,12 +42,12 @@ namespace OpenRCT2::Ui } auto viewport = window->viewport; auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::Footpath)); - if (info.SpriteType != ViewportInteractionItem::Footpath + if (info.interactionType != ViewportInteractionItem::Footpath || !(viewport->flags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL))) { info = GetMapCoordinatesFromPosWindow( window, screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Footpath)); - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { auto position = info.Loc; position.SetNull(); @@ -60,7 +60,7 @@ namespace OpenRCT2::Ui auto myTileElement = info.Element; auto position = info.Loc.ToTileCentre(); auto z = 0; - if (info.SpriteType == ViewportInteractionItem::Footpath) + if (info.interactionType == ViewportInteractionItem::Footpath) { z = myTileElement->GetBaseZ(); if (myTileElement->AsPath()->IsSloped()) @@ -73,7 +73,7 @@ namespace OpenRCT2::Ui for (int32_t i = 0; i < 5; i++) { - if (info.SpriteType != ViewportInteractionItem::Footpath) + if (info.interactionType != ViewportInteractionItem::Footpath) { z = TileElementHeight(position); } @@ -141,7 +141,7 @@ namespace OpenRCT2::Ui auto viewport = window->viewport; auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::Ride)); *tileElement = info.Element; - if (info.SpriteType == ViewportInteractionItem::Ride + if (info.interactionType == ViewportInteractionItem::Ride && viewport->flags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL) && (*tileElement)->GetType() == TileElementType::Entrance) { @@ -160,7 +160,7 @@ namespace OpenRCT2::Ui info = GetMapCoordinatesFromPosWindow( window, screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Footpath, ViewportInteractionItem::Ride)); - if (info.SpriteType == ViewportInteractionItem::Ride && (*tileElement)->GetType() == TileElementType::Entrance) + if (info.interactionType == ViewportInteractionItem::Ride && (*tileElement)->GetType() == TileElementType::Entrance) { uint32_t directions = (*tileElement)->AsEntrance()->GetDirections(); if (directions & 0x0F) diff --git a/src/openrct2-ui/ride/Construction.cpp b/src/openrct2-ui/ride/Construction.cpp index 3301d10089..9362432430 100644 --- a/src/openrct2-ui/ride/Construction.cpp +++ b/src/openrct2-ui/ride/Construction.cpp @@ -117,7 +117,7 @@ namespace OpenRCT2 gRideEntranceExitPlaceDirection = INVALID_DIRECTION; // determine if the mouse is hovering over a station - that's the station to add the entrance to auto info = GetMapCoordinatesFromPos(screenCoords, EnumsToFlags(ViewportInteractionItem::Ride)); - if (info.SpriteType != ViewportInteractionItem::None) + if (info.interactionType != ViewportInteractionItem::None) { if (info.Element->GetType() == TileElementType::Track) { diff --git a/src/openrct2-ui/scripting/CustomMenu.cpp b/src/openrct2-ui/scripting/CustomMenu.cpp index 66ca49e3a8..8fc255c519 100644 --- a/src/openrct2-ui/scripting/CustomMenu.cpp +++ b/src/openrct2-ui/scripting/CustomMenu.cpp @@ -195,7 +195,7 @@ namespace OpenRCT2::Scripting obj.Set("screenCoords", ToDuk(ctx, screenCoords)); obj.Set("mapCoords", ToDuk(ctx, info.Loc)); - if (info.SpriteType == ViewportInteractionItem::Entity && info.Entity != nullptr) + if (info.interactionType == ViewportInteractionItem::Entity && info.Entity != nullptr) { obj.Set("entityId", info.Entity->Id.ToUnderlying()); } diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 364233be15..76102abbfd 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -817,7 +817,7 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::LargeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - if (info.SpriteType != ViewportInteractionItem::None) + if (info.interactionType != ViewportInteractionItem::None) { const bool allowInvalidHeights = GetGameState().Cheats.AllowTrackPlaceInvalidHeights; const auto heightStep = kCoordsZStep * (!allowInvalidHeights ? 2 : 1); @@ -872,7 +872,7 @@ namespace OpenRCT2::Ui::Windows auto info = GetMapCoordinatesFromPos( screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Footpath)); - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) return std::nullopt; mapCoords = info.Loc; @@ -918,14 +918,14 @@ namespace OpenRCT2::Ui::Windows int32_t FootpathGetSlopeFromInfo(const InteractionInfo& info) { - if (info.SpriteType == ViewportInteractionItem::None || info.Element == nullptr) + if (info.interactionType == ViewportInteractionItem::None || info.Element == nullptr) { gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; FootpathUpdateProvisional(); return kTileSlopeFlat; } - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Terrain: { @@ -959,12 +959,12 @@ namespace OpenRCT2::Ui::Windows int32_t FootpathGetBaseZFromInfo(const InteractionInfo& info) { - if (info.SpriteType == ViewportInteractionItem::None || info.Element == nullptr) + if (info.interactionType == ViewportInteractionItem::None || info.Element == nullptr) { return 0; } - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Terrain: { diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 876a9daa62..c9b3f14064 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -945,7 +945,7 @@ namespace OpenRCT2::Ui::Windows gPickupPeepImage = ImageId(); auto info = GetMapCoordinatesFromPos(screenCoords, ViewportInteractionItemAll); - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) return; gPickupPeepX = screenCoords.x - 1; diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index bff45669c1..d7b4624959 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -462,7 +462,7 @@ namespace OpenRCT2::Ui::Windows auto info = GetMapCoordinatesFromPos( screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water)); - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { if (_landRightsCost != kMoney64Undefined) { diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 4add6c1aee..dd9fb3a759 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -4205,7 +4205,7 @@ namespace OpenRCT2::Ui::Windows auto newColourScheme = static_cast(_rideColour); auto info = GetMapCoordinatesFromPos(screenPos, EnumsToFlags(ViewportInteractionItem::Ride)); - if (info.SpriteType != ViewportInteractionItem::Ride) + if (info.interactionType != ViewportInteractionItem::Ride) return; if (info.Element->GetType() != TileElementType::Track) return; @@ -5554,14 +5554,14 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::Scenery, ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Scenery: case ViewportInteractionItem::LargeScenery: case ViewportInteractionItem::Wall: case ViewportInteractionItem::Footpath: _collectTrackDesignScenery = !TrackDesignSaveContainsTileElement(info.Element); - TrackDesignSaveSelectTileElement(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery); + TrackDesignSaveSelectTileElement(info.interactionType, info.Loc, info.Element, _collectTrackDesignScenery); break; default: break; @@ -5579,13 +5579,13 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::Scenery, ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Scenery: case ViewportInteractionItem::LargeScenery: case ViewportInteractionItem::Wall: case ViewportInteractionItem::Footpath: - TrackDesignSaveSelectTileElement(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery); + TrackDesignSaveSelectTileElement(info.interactionType, info.Loc, info.Element, _collectTrackDesignScenery); break; default: break; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 2a5edf8361..2eb950856b 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2928,7 +2928,7 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::Label, ViewportInteractionItem::Banner); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - if (info.SpriteType != ViewportInteractionItem::None) + if (info.interactionType != ViewportInteractionItem::None) { _trackPlaceCtrlZ = info.Element->GetBaseZ(); _trackPlaceCtrlState = true; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 91b67b5794..7af4b72184 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -2204,7 +2204,7 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery, ViewportInteractionItem::Banner); auto info = GetMapCoordinatesFromPos(screenCoords, flag); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Scenery: { @@ -2281,7 +2281,7 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery, ViewportInteractionItem::Banner, ViewportInteractionItem::PathAddition); auto info = GetMapCoordinatesFromPos(screenCoords, flag); - switch (info.SpriteType) + switch (info.interactionType) { case ViewportInteractionItem::Scenery: { @@ -2374,7 +2374,7 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::LargeScenery); auto info = GetMapCoordinatesFromPos(screenPos, flag); - if (info.SpriteType != ViewportInteractionItem::None) + if (info.interactionType != ViewportInteractionItem::None) { gSceneryCtrlPressed = true; gSceneryCtrlPressZ = info.Element->GetBaseZ(); @@ -2551,7 +2551,7 @@ namespace OpenRCT2::Ui::Windows auto info = GetMapCoordinatesFromPos(screenPos, flag); gridPos = info.Loc; - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { gridPos.SetNull(); return; @@ -2644,7 +2644,7 @@ namespace OpenRCT2::Ui::Windows auto info = GetMapCoordinatesFromPos(screenPos, flag); gridPos = info.Loc; - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { gridPos.SetNull(); return; @@ -2868,7 +2868,7 @@ namespace OpenRCT2::Ui::Windows auto info = GetMapCoordinatesFromPos(screenPos, flag); gridPos = info.Loc; - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { gridPos.SetNull(); return; diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 046c4d2600..82d5fee932 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -669,7 +669,7 @@ namespace OpenRCT2::Ui::Windows gPickupPeepImage = ImageId(); auto info = GetMapCoordinatesFromPos(screenCoords, ViewportInteractionItemAll); - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) return; gPickupPeepX = screenCoords.x - 1; diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index c959902eee..8d3d9e29b0 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -464,7 +464,7 @@ namespace OpenRCT2::Ui::Windows ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - if (info.SpriteType == ViewportInteractionItem::Terrain) + if (info.interactionType == ViewportInteractionItem::Terrain) { _trackPlaceCtrlZ = Floor2(surfaceElement->GetBaseZ(), kCoordsZStep); diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index a1c0e62472..93fe35e0f5 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -328,7 +328,7 @@ namespace OpenRCT2::Ui::Windows auto info = GetMapCoordinatesFromPos( screenPos, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water)); - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { if (_waterToolRaiseCost != kMoney64Undefined || _waterToolLowerCost != kMoney64Undefined) { diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 7143cb1827..8c87d4082f 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -316,7 +316,7 @@ void LightFXPrepareLightList() mapCoord = info.Loc; mapCoord.x += tileOffsetX; mapCoord.y += tileOffsetY; - interactionType = info.SpriteType; + interactionType = info.interactionType; tileElement = info.Element; } diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 2057b4b3f2..dc2642b5db 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -69,7 +69,7 @@ InteractionInfo::InteractionInfo(const PaintStruct* ps) : Loc(ps->MapPos) , Element(ps->Element) , Entity(ps->Entity) - , SpriteType(ps->InteractionItem) + , interactionType(ps->InteractionItem) { } @@ -1561,7 +1561,7 @@ VisibilityKind GetPaintStructVisibility(const PaintStruct* ps, uint32_t viewFlag /** * Checks if a PaintStruct sprite type is in the filter mask. */ -static bool PSSpriteTypeIsInFilter(PaintStruct* ps, uint16_t filter) +static bool PSInteractionTypeIsInFilter(PaintStruct* ps, uint16_t filter) { if (ps->InteractionItem != ViewportInteractionItem::None && ps->InteractionItem != ViewportInteractionItem::Label && ps->InteractionItem <= ViewportInteractionItem::Banner) @@ -1745,7 +1745,8 @@ InteractionInfo SetInteractionInfoFromPaintSession(PaintSession* session, uint32 ps = next_ps; if (IsSpriteInteractedWith(session->DPI, ps->image_id, ps->ScreenPos)) { - if (PSSpriteTypeIsInFilter(ps, filter) && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::Visible) + if (PSInteractionTypeIsInFilter(ps, filter) + && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::Visible) { info = { ps }; } @@ -1759,7 +1760,8 @@ InteractionInfo SetInteractionInfoFromPaintSession(PaintSession* session, uint32 { if (IsSpriteInteractedWith(session->DPI, attached_ps->image_id, ps->ScreenPos + attached_ps->RelativePos)) { - if (PSSpriteTypeIsInFilter(ps, filter) && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::Visible) + if (PSInteractionTypeIsInFilter(ps, filter) + && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::Visible) { info = { ps }; } @@ -1911,7 +1913,7 @@ std::optional ScreenGetMapXY(const ScreenCoordsXY& screenCoords, Viewp } auto myViewport = window->viewport; auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain)); - if (info.SpriteType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::None) { return std::nullopt; } diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index 75883321d0..087eaf9f48 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -112,7 +112,7 @@ struct InteractionInfo CoordsXY Loc; TileElement* Element{}; EntityBase* Entity{}; - ViewportInteractionItem SpriteType = ViewportInteractionItem::None; + ViewportInteractionItem interactionType = ViewportInteractionItem::None; }; constexpr int32_t kMaxViewportCount = kWindowLimitMax;