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

Move over switches to normalised tile element types

Browse Source
This commit is contained in:
Gymnasiast
2021-12-11 00:30:59 +01:00
parent bedcba5ea8
commit fc3ce3294c
23 changed files with 386 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/windows/Map.cpp
View File

@@ -1471,19 +1471,19 @@ static uint16_t MapWindowGetPixelColourRide(const CoordsXY& c)
break;
}
switch (tileElement->GetType())
switch (tileElement->GetTypeN())
{
case TILE_ELEMENT_TYPE_SURFACE:
case TileElementTypeN::Surface:
if (tileElement->AsSurface()->GetWaterHeight() > 0)
// Why is this a different water colour as above (195)?
colourB = MapColour(PALETTE_INDEX_194);
if (!(tileElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED))
colourB = MapColourUnowned(colourB);
break;
case TILE_ELEMENT_TYPE_PATH:
case TileElementTypeN::Path:
colourA = MapColour(PALETTE_INDEX_14); // lighter grey
break;
case TILE_ELEMENT_TYPE_ENTRANCE:
case TileElementTypeN::Entrance:
if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_PARK_ENTRANCE)
break;
ride = get_ride(tileElement->AsEntrance()->GetRideIndex());
@@ -1493,7 +1493,7 @@ static uint16_t MapWindowGetPixelColourRide(const CoordsXY& c)
colourA = RideKeyColours[static_cast<size_t>(colourKey)];
}
break;
case TILE_ELEMENT_TYPE_TRACK:
case TileElementTypeN::Track:
ride = get_ride(tileElement->AsTrack()->GetRideIndex());
if (ride != nullptr)
{
@@ -1501,6 +1501,8 @@ static uint16_t MapWindowGetPixelColourRide(const CoordsXY& c)
colourA = RideKeyColours[static_cast<size_t>(colourKey)];
}
break;
default:
break;
}
} while (!(tileElement++)->IsLastForTile());