mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Fix underground check for sloped surfaces / clipping improvement

Browse Source
This commit is contained in:
Jeroen D Stout
2017-09-30 22:22:21 +02:00
committed by Aaron van Geffen
parent 79fa16138a
commit 58321ec2cd
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/paint/tile_element/virtual_floor.c
View File

@@ -98,7 +98,12 @@ void virtual_floor_paint(paint_session * session)
if (elementType == TILE_ELEMENT_TYPE_SURFACE)
{
if (virtualFloorClipHeight < tileElement->base_height)
if (virtualFloorClipHeight < tileElement->clearance_height)
{
weAreBelowGround = true;
}
else if (virtualFloorClipHeight < tileElement->base_height + 2 &&
tileElement->properties.surface.slope != 0)
{
weAreBelowGround = true;
}
@@ -144,7 +149,12 @@ void virtual_floor_paint(paint_session * session)
if (elementType == TILE_ELEMENT_TYPE_SURFACE)
{
if (virtualFloorClipHeight < tileElement->base_height)
if (virtualFloorClipHeight < tileElement->clearance_height)
{
theyAreBelowGround = true;
}
else if (virtualFloorClipHeight < tileElement->base_height + 2 &&
tileElement->properties.surface.slope != 0)
{
theyAreBelowGround = true;
}
@@ -197,8 +207,8 @@ void virtual_floor_paint(paint_session * session)
}
}
sub_98197C(session, SPR_G2_SELECTION_EDGE_NW | ((occupiedEdges & 0x8)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 5, 16, gMapVirtualFloorHeight + 1, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_SW | ((occupiedEdges & 0x4)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 27, 16, gMapVirtualFloorHeight + 1, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_NE | ((occupiedEdges & 0x1)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 16, 5, gMapVirtualFloorHeight + 1, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_SE | ((occupiedEdges & 0x2)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 16, 27, gMapVirtualFloorHeight + 1, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_NW | ((occupiedEdges & 0x8)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 5, 16, gMapVirtualFloorHeight + 0, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_SW | ((occupiedEdges & 0x4)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 27, 16, gMapVirtualFloorHeight + 0, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_NE | ((occupiedEdges & 0x1)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 16, 5, gMapVirtualFloorHeight + 0, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_SE | ((occupiedEdges & 0x2)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 16, 27, gMapVirtualFloorHeight + 0, get_current_rotation());
}