diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 9cfb1c1055..0886c28936 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -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. diff --git a/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp index 989c4fea48..72427d1647 100644 --- a/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp @@ -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)