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

Fix LIM Launched inline twists drawing over land when built underground

Browse Source
This commit is contained in:
mix
2025-08-22 07:10:17 +01:00
committed by GitHub
parent db902f4e84
commit b5db741d14
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -20,6 +20,7 @@
- Fix: [#24835] Dive loop track pieces do not have tunnels.
- Fix: [#24884] Smooth map and add beaches functions use incorrect map size with height map image files.
- Fix: [#24915] LIM Launched (original bug), Corkscrew and Twister Roller Coaster inline twists have some incorrect tunnels.
- Fix: [#24916] LIM Launched inline twists can draw over land edges when built underground (original bug).
- Fix: [#24953] Crash when opening the Scenario Editor, Track Designer or Track Designs Manager.
- Fix: [#24955] Hybrid Zero G Rolls do not fully block metal supports.
- Fix: [#24958] Android: fix crash when device is offline.

64
src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp
View File

@@ -693,34 +693,34 @@ static void LimLaunchedRCTrackLeftTwistDownToUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15760), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15784), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15763), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15787), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15766), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15790), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15769), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15793), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
}
switch (direction)
@@ -855,34 +855,34 @@ static void LimLaunchedRCTrackRightTwistDownToUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15772), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15796), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15775), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15799), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15778), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15802), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15781), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15805), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
}
switch (direction)
@@ -920,34 +920,34 @@ static void LimLaunchedRCTrackLeftTwistUpToDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15766), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15790), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15769), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15793), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15760), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15784), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15763), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15787), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
}
if (direction == 0 || direction == 3)
@@ -1082,34 +1082,34 @@ static void LimLaunchedRCTrackRightTwistUpToDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15778), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15802), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15781), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15805), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15772), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15796), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15775), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
{ { 0, 6, height - 16 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(15799), { 0, 0, height },
{ { 0, 6, height + 44 }, { 32, 20, 0 } });
{ { 0, 6, height + 12 }, { 32, 20, 0 } });
break;
}
if (direction == 0 || direction == 3)