mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Fix #18389: Gentle sloped track not visible in fallback tunnels

Browse Source
This commit is contained in:
mix
2025-02-20 19:06:33 +00:00
committed by GitHub
parent acf18b5a15
commit 9c75543240
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -9,6 +9,7 @@
- Fix: [#16357] Chairlift station covers draw incorrectly.
- Fix: [#16657] Mine Ride right S-bend uses Mini Roller Coaster sprite (original bug).
- Fix: [#18376] Ghost train gentle to flat track is not visible in tunnels.
- Fix: [#18389] Gentle sloped track pieces are not visible in low clearance height tunnels (original bug).
- Fix: [#18423] Underground Mini Golf holes can draw over land edges (original bug).
- Fix: [#18436] Scenery on the same tile as steep to vertical track can draw over the track (original bug).
- Fix: [#18711] Park entrances with their sides underground can cause glitching.

15
src/openrct2/paint/tile_element/Paint.Surface.cpp
View File

@@ -171,7 +171,7 @@ static constexpr TunnelDescriptor kTunnels[] = {
{ 3, 5, -32, 4, TunnelType::StandardFlat, 44 }, // TunnelType::StandardSlopeEnd
{ 3, 3, 0, 15, TunnelType::InvertedFlat, 48 }, // TunnelType::InvertedFlat
{ 4, 4, 0, 15, TunnelType::InvertedFlat, 52 }, // TunnelType::InvertedSlopeStart
{ 4, 6, -48, 4, TunnelType::InvertedFlat, 56 }, // TunnelType::InvertedSlopeEnd
{ 4, 7, -48, 4, TunnelType::InvertedFlat, 56 }, // TunnelType::InvertedSlopeEnd
{ 2, 2, 0, 15, TunnelType::SquareFlat, 60 }, // TunnelType::SquareFlat
{ 3, 3, 0, 15, TunnelType::SquareFlat, 64 }, // TunnelType::SquareSlopeStart
{ 3, 5, -32, 4, TunnelType::SquareFlat, 68 }, // TunnelType::SquareSlopeEnd
@@ -658,7 +658,8 @@ static void ViewportSurfaceDrawTileSideBottom(
// Tunnels
auto tunnelType = tunnelArray[tunnelIndex].type;
auto td = kTunnels[EnumValue(tunnelType)];
const auto tdOriginal = kTunnels[EnumValue(tunnelType)];
auto td = tdOriginal;
uint8_t tunnelHeight = td.height;
int16_t zOffset = curHeight;
@@ -671,8 +672,10 @@ static void ViewportSurfaceDrawTileSideBottom(
zOffset *= 16;
int16_t boundBoxOffsetZ = zOffset + td.boundBoxZOffset;
int8_t boundBoxLength = td.boundBoxLength * 16;
const int8_t boundBoxLengthBase = (tdOriginal.boundBoxLength + (td.height - tdOriginal.height)) * 16;
int16_t boundBoxOffsetZ = zOffset + tdOriginal.boundBoxZOffset;
int8_t boundBoxLength = boundBoxLengthBase;
if (boundBoxOffsetZ < 16)
{
boundBoxOffsetZ += 16;
@@ -684,8 +687,8 @@ static void ViewportSurfaceDrawTileSideBottom(
session, imageId, { offset, zOffset }, { { 0, 0, boundBoxOffsetZ }, { tunnelBounds, boundBoxLength - 1 } });
boundBoxOffsetZ = curHeight * kCoordsZPerTinyZ;
boundBoxLength = td.boundBoxLength * 16;
boundBoxOffsetZ += td.boundBoxZOffset;
boundBoxLength = boundBoxLengthBase;
boundBoxOffsetZ += tdOriginal.boundBoxZOffset;
if (boundBoxOffsetZ == 0)
{
boundBoxOffsetZ += 16;