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

Clean up many other coordinates

Browse Source
This commit is contained in:
Gymnasiast
2020-03-13 12:03:43 +01:00
parent 3412c47a9e
commit bdf681f440
32 changed files with 132 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/openrct2/paint/VirtualFloor.cpp
View File

@@ -248,23 +248,23 @@ static void virtual_floor_get_tile_properties(
if (elementType == TILE_ELEMENT_TYPE_SURFACE)
{
if (height < tileElement->clearance_height)
if (height < tileElement->GetClearanceZ())
{
*outBelowGround = true;
}
else if (height < tileElement->base_height + 2 && tileElement->AsSurface()->GetSlope() != 0)
else if (height < (tileElement->GetBaseZ() + LAND_HEIGHT_STEP) && tileElement->AsSurface()->GetSlope() != 0)
{
*outBelowGround = true;
*outOccupied = true;
}
if (height > tileElement->base_height)
if (height > tileElement->GetBaseZ())
{
*aboveGround = true;
}
continue;
}
if (height >= tileElement->clearance_height || height < tileElement->base_height)
if (height >= tileElement->GetClearanceZ() || height < tileElement->GetBaseZ())
{
continue;
}
@@ -289,10 +289,10 @@ static void virtual_floor_get_tile_properties(
void virtual_floor_paint(paint_session* session)
{
static constexpr const CoordsXY scenery_half_tile_offsets[4] = {
{ -32, 0 },
{ 0, 32 },
{ 32, 0 },
{ 0, -32 },
{ -COORDS_XY_STEP, 0 },
{ 0, COORDS_XY_STEP },
{ COORDS_XY_STEP, 0 },
{ 0, -COORDS_XY_STEP },
};
if (_virtualFloorHeight < MINIMUM_LAND_HEIGHT)
@@ -303,7 +303,7 @@ void virtual_floor_paint(paint_session* session)
// This is a virtual floor, so no interactions
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
int16_t virtualFloorClipHeight = _virtualFloorHeight / 8;
int16_t virtualFloorClipHeight = _virtualFloorHeight;
// Check for occupation and walls
bool weAreOccupied;
@@ -325,9 +325,9 @@ void virtual_floor_paint(paint_session* session)
// Try the four tiles next to us for the same parameters as above,
// if our parameters differ we set an edge towards that tile
for (uint8_t i = 0; i < 4; i++)
for (uint8_t i = 0; i < NumOrthogonalDirections; i++)
{
uint8_t effectiveRotation = (4 + i - direction) % 4;
uint8_t effectiveRotation = (NumOrthogonalDirections + i - direction) % NumOrthogonalDirections;
CoordsXY theirLocation = session->MapPosition + scenery_half_tile_offsets[effectiveRotation];
bool theyAreOccupied;
@@ -341,7 +341,7 @@ void virtual_floor_paint(paint_session* session)
theirLocation, virtualFloorClipHeight, &theyAreOccupied, &theyAreOwned, &theirOccupiedEdges, &theyAreBelowGround,
&theyAreAboveGround, &theyAreLit);
if (theirOccupiedEdges & (1 << ((effectiveRotation + 2) % 4)) && (weAreOwned && !theyAreOwned))
if (theirOccupiedEdges & (1 << ((effectiveRotation + 2) % NumOrthogonalDirections)) && (weAreOwned && !theyAreOwned))
{
occupiedEdges |= 1 << i;
}