mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 19:25:12 +01:00
Code Issues Releases Wiki Activity

Rename InteractionInfo::SpriteType to interactionType

Browse Source
This commit is contained in:
Aaron van Geffen
2024-09-22 16:53:43 +02:00
parent 6d27369ea6
commit 97acb793e8
16 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/interface/ViewportQuery.cpp
View File

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