mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Code Style: Remove snake casing in PaintHelpers (#18247)

This commit is contained in:
Rik Smeets 2022-10-08 11:24:50 +02:00 committed by GitHub
parent ea04c0b010
commit 00d2dd8ef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 1919 additions and 1919 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/paint/Paint.h
View File

@ -319,7 +319,7 @@ paint_struct* PaintAddImageAsParentRotated(
paint_session& session, const uint8_t direction, const ImageId& imageId, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset);
void paint_util_push_tunnel_rotated(paint_session& session, uint8_t direction, uint16_t height, uint8_t type);
void PaintUtilPushTunnelRotated(paint_session& session, uint8_t direction, uint16_t height, uint8_t type);
bool PaintAttachToPreviousAttach(paint_session& session, const ImageId& imageId, int32_t x, int32_t y);
bool PaintAttachToPreviousPS(paint_session& session, const ImageId& image_id, int32_t x, int32_t y);

2
src/openrct2/paint/PaintHelpers.cpp
View File

@ -52,7 +52,7 @@ paint_struct* PaintAddImageAsChildRotated(
return PaintAddImageAsChild(session, image_id, offset, boundBoxSize, boundBoxOffset);
}
void paint_util_push_tunnel_rotated(paint_session& session, uint8_t direction, uint16_t height, uint8_t type)
void PaintUtilPushTunnelRotated(paint_session& session, uint8_t direction, uint16_t height, uint8_t type)
{
if (direction & 1)
{

2
src/openrct2/paint/tile_element/Paint.Entrance.cpp
View File

@ -188,7 +188,7 @@ static void PaintRideEntranceExit(paint_session& session, uint8_t direction, int
{ { (direction & 1) ? 28 : 2, (direction & 1) ? 2 : 28, height }, boundBoxLength });
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
if (!entranceEl.IsGhost())
PaintRideEntranceExitScrollingText(session, entranceEl, *stationObj, direction, height);

18
src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp
View File

@ -192,7 +192,7 @@ static void air_powered_vertical_rc_track_flat(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -220,7 +220,7 @@ static void air_powered_vertical_rc_track_station(
track_paint_util_draw_narrow_station_platform(session, ride, direction, height, 5, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -338,7 +338,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -367,7 +367,7 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -516,7 +516,7 @@ static void air_powered_vertical_rc_track_left_bank(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -545,7 +545,7 @@ static void air_powered_vertical_rc_track_brakes(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -666,7 +666,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence], 0x20);
@ -696,7 +696,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
if (trackSequence == 0)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -962,7 +962,7 @@ static void air_powered_vertical_rc_track_onride_photo(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

92
src/openrct2/ride/coaster/AlpineCoaster.cpp
View File

@ -86,7 +86,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -120,7 +120,7 @@ namespace AlpineRC
{ 32, 28, 2 }, { 0, 2, height });
track_paint_util_draw_station_metal_supports(session, direction, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 4, 7);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -197,11 +197,11 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -278,11 +278,11 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -359,11 +359,11 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -430,7 +430,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -565,7 +565,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -773,7 +773,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -937,7 +937,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2186,7 +2186,7 @@ namespace AlpineRC
session, direction & 1 ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2233,7 +2233,7 @@ namespace AlpineRC
session, direction & 1 ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2300,11 +2300,11 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2358,11 +2358,11 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2416,11 +2416,11 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2474,11 +2474,11 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2550,7 +2550,7 @@ namespace AlpineRC
session, direction & 1 ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3756,7 +3756,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3899,7 +3899,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4111,7 +4111,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4275,7 +4275,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4455,7 +4455,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4553,7 +4553,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4672,7 +4672,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4872,7 +4872,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5084,7 +5084,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5238,7 +5238,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5400,7 +5400,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -5612,7 +5612,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -5665,7 +5665,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -5877,7 +5877,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -5956,7 +5956,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -6314,7 +6314,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -6366,7 +6366,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -6734,7 +6734,7 @@ namespace AlpineRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -6795,7 +6795,7 @@ namespace AlpineRC
session, direction & 1 ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -6844,7 +6844,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6946,7 +6946,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7044,7 +7044,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7146,7 +7146,7 @@ namespace AlpineRC
session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

76
src/openrct2/ride/coaster/BobsleighCoaster.cpp
View File

@ -91,7 +91,7 @@ static void bobsleigh_rc_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -116,7 +116,7 @@ static void bobsleigh_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -212,11 +212,11 @@ static void bobsleigh_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -314,11 +314,11 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -416,11 +416,11 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -497,7 +497,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -739,7 +739,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -789,7 +789,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -839,7 +839,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -889,7 +889,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -941,7 +941,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1185,11 +1185,11 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1242,11 +1242,11 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1299,11 +1299,11 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1356,11 +1356,11 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1443,7 +1443,7 @@ static void bobsleigh_rc_track_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1503,7 +1503,7 @@ static void bobsleigh_rc_track_s_bend_left(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1700,7 +1700,7 @@ static void bobsleigh_rc_track_s_bend_right(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1897,7 +1897,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2054,7 +2054,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2211,7 +2211,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2445,7 +2445,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2501,7 +2501,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2735,7 +2735,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2820,7 +2820,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3228,7 +3228,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3284,7 +3284,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3692,7 +3692,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3761,7 +3761,7 @@ static void bobsleigh_rc_track_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3800,7 +3800,7 @@ static void bobsleigh_rc_track_block_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3864,7 +3864,7 @@ static void bobsleigh_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}

236
src/openrct2/ride/coaster/BolligerMabillardTrack.hpp
View File

@ -72,7 +72,7 @@ static void bolliger_mabillard_track_flat(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -112,7 +112,7 @@ static void bolliger_mabillard_track_station(
track_paint_util_draw_narrow_station_platform(session, ride, direction, height, 9, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -184,11 +184,11 @@ static void bolliger_mabillard_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -262,11 +262,11 @@ static void bolliger_mabillard_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -340,11 +340,11 @@ static void bolliger_mabillard_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -430,11 +430,11 @@ static void bolliger_mabillard_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -520,11 +520,11 @@ static void bolliger_mabillard_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -598,11 +598,11 @@ static void bolliger_mabillard_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -695,7 +695,7 @@ static void bolliger_mabillard_track_left_quarter_turn_5(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -884,7 +884,7 @@ static void bolliger_mabillard_track_flat_to_left_bank(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -928,7 +928,7 @@ static void bolliger_mabillard_track_flat_to_right_bank(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -972,7 +972,7 @@ static void bolliger_mabillard_track_left_bank_to_flat(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1016,7 +1016,7 @@ static void bolliger_mabillard_track_right_bank_to_flat(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1062,7 +1062,7 @@ static void bolliger_mabillard_track_banked_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1256,11 +1256,11 @@ static void bolliger_mabillard_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1307,11 +1307,11 @@ static void bolliger_mabillard_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1358,11 +1358,11 @@ static void bolliger_mabillard_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1409,11 +1409,11 @@ static void bolliger_mabillard_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1488,7 +1488,7 @@ static void bolliger_mabillard_track_left_bank(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1536,7 +1536,7 @@ static void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1711,7 +1711,7 @@ static void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1906,7 +1906,7 @@ static void bolliger_mabillard_track_s_bend_left(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2051,7 +2051,7 @@ static void bolliger_mabillard_track_s_bend_right(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2199,7 +2199,7 @@ static void bolliger_mabillard_track_left_vertical_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -2477,7 +2477,7 @@ static void bolliger_mabillard_track_right_vertical_loop(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
break;
@ -2726,7 +2726,7 @@ static void bolliger_mabillard_track_left_quarter_turn_3(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2851,7 +2851,7 @@ static void bolliger_mabillard_track_left_quarter_turn_3_bank(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2976,7 +2976,7 @@ static void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3063,7 +3063,7 @@ static void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3176,7 +3176,7 @@ static void bolliger_mabillard_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, supportType, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3359,7 +3359,7 @@ static void bolliger_mabillard_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, supportType, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3406,7 +3406,7 @@ static void bolliger_mabillard_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, supportType, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3589,7 +3589,7 @@ static void bolliger_mabillard_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, supportType, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3666,7 +3666,7 @@ static void bolliger_mabillard_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, supportType, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3975,7 +3975,7 @@ static void bolliger_mabillard_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, supportType, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4022,7 +4022,7 @@ static void bolliger_mabillard_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, supportType, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4337,7 +4337,7 @@ static void bolliger_mabillard_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4509,7 +4509,7 @@ static void bolliger_mabillard_track_brakes(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4549,11 +4549,11 @@ static void bolliger_mabillard_track_25_deg_up_left_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4594,11 +4594,11 @@ static void bolliger_mabillard_track_25_deg_up_right_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4650,7 +4650,7 @@ static void bolliger_mabillard_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -4755,7 +4755,7 @@ static void bolliger_mabillard_track_60_deg_up_to_90_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(
@ -4851,7 +4851,7 @@ static void bolliger_mabillard_track_60_deg_down_to_90_deg_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4896,7 +4896,7 @@ static void bolliger_mabillard_track_left_eighth_to_diag(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5037,7 +5037,7 @@ static void bolliger_mabillard_track_right_eighth_to_diag(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5198,7 +5198,7 @@ static void bolliger_mabillard_track_left_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5339,7 +5339,7 @@ static void bolliger_mabillard_track_right_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8943,7 +8943,7 @@ static void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9033,7 +9033,7 @@ static void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_u
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9126,7 +9126,7 @@ static void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_ban
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9216,7 +9216,7 @@ static void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_b
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9299,7 +9299,7 @@ static void bolliger_mabillard_track_block_brakes(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -9339,7 +9339,7 @@ static void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9426,7 +9426,7 @@ static void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9536,7 +9536,7 @@ static void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9711,7 +9711,7 @@ static void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9909,11 +9909,11 @@ static void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9957,11 +9957,11 @@ static void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10005,11 +10005,11 @@ static void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10053,11 +10053,11 @@ static void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10134,11 +10134,11 @@ static void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10179,11 +10179,11 @@ static void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10224,11 +10224,11 @@ static void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10269,11 +10269,11 @@ static void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10353,11 +10353,11 @@ static void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10401,11 +10401,11 @@ static void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10449,11 +10449,11 @@ static void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10497,11 +10497,11 @@ static void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10730,11 +10730,11 @@ static void bolliger_mabillard_track_flat_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10814,11 +10814,11 @@ static void bolliger_mabillard_track_60_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10880,11 +10880,11 @@ static void bolliger_mabillard_track_brake_for_drop(
metal_a_supports_paint_setup(session, supportType, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10926,7 +10926,7 @@ static void bolliger_mabillard_track_half_loop_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -11019,7 +11019,7 @@ static void bolliger_mabillard_track_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -11072,7 +11072,7 @@ static void bolliger_mabillard_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -11181,7 +11181,7 @@ static void bolliger_mabillard_track_right_corkscrew_up(
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -11314,7 +11314,7 @@ static void bolliger_mabillard_track_flat_to_60_deg_up_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -11466,7 +11466,7 @@ static void bolliger_mabillard_track_60_deg_up_to_flat_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -11647,7 +11647,7 @@ static void bolliger_mabillard_track_left_barrel_roll_up_to_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -11798,7 +11798,7 @@ static void bolliger_mabillard_track_right_barrel_roll_up_to_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -11949,11 +11949,11 @@ static void bolliger_mabillard_track_powered_lift(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -11994,7 +11994,7 @@ static void bolliger_mabillard_track_left_large_half_loop_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -12177,7 +12177,7 @@ static void bolliger_mabillard_track_left_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -12222,7 +12222,7 @@ static void bolliger_mabillard_track_right_large_half_loop_up(
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -12405,7 +12405,7 @@ static void bolliger_mabillard_track_right_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -12523,7 +12523,7 @@ static void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -12571,7 +12571,7 @@ void bolliger_mabillard_track_booster(
{
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -12611,7 +12611,7 @@ static void bolliger_mabillard_track_left_twist_down_to_up(
metal_a_supports_paint_setup(session, supportType, 4, 0, height - 5, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -12727,7 +12727,7 @@ static void bolliger_mabillard_track_right_twist_down_to_up(
metal_a_supports_paint_setup(session, supportType, 4, 0, height - 5, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -12848,7 +12848,7 @@ static void bolliger_mabillard_track_left_twist_up_to_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 24, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 24, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -12964,7 +12964,7 @@ static void bolliger_mabillard_track_right_twist_up_to_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;

26
src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp
View File

@ -253,7 +253,7 @@ static void classic_wooden_rc_track_flat_to_left_bank(
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -286,7 +286,7 @@ static void classic_wooden_rc_track_flat_to_right_bank(
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -332,7 +332,7 @@ static void classic_wooden_rc_track_left_bank(
};
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -374,11 +374,11 @@ static void classic_wooden_rc_track_left_bank_to_25_deg_up(
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -415,11 +415,11 @@ static void classic_wooden_rc_track_right_bank_to_25_deg_up(
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -456,11 +456,11 @@ static void classic_wooden_rc_track_25_deg_up_to_left_bank(
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -497,11 +497,11 @@ static void classic_wooden_rc_track_25_deg_up_to_right_bank(
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -947,7 +947,7 @@ static void classic_wooden_rc_track_left_eighth_bank_to_diag(
if (trackSequence == 0 && (direction == 0 || direction == 3))
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
if (supportType[direction][trackSequence] != -1)
@ -1086,7 +1086,7 @@ static void classic_wooden_rc_track_right_eighth_bank_to_diag(
if (trackSequence == 0 && (direction == 0 || direction == 3))
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
if (supportType[direction][trackSequence] != -1)

120
src/openrct2/ride/coaster/CompactInvertedCoaster.cpp
View File

@ -68,7 +68,7 @@ static void compact_inverted_rc_track_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -95,7 +95,7 @@ static void compact_inverted_rc_track_station(
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -185,11 +185,11 @@ static void compact_inverted_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -253,11 +253,11 @@ static void compact_inverted_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -349,11 +349,11 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -429,11 +429,11 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -537,11 +537,11 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
}
@ -631,11 +631,11 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -728,7 +728,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -919,7 +919,7 @@ static void compact_inverted_rc_track_flat_to_left_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -962,7 +962,7 @@ static void compact_inverted_rc_track_flat_to_right_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -1005,7 +1005,7 @@ static void compact_inverted_rc_track_left_bank_to_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -1048,7 +1048,7 @@ static void compact_inverted_rc_track_right_bank_to_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -1092,7 +1092,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1303,11 +1303,11 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -1370,11 +1370,11 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -1437,11 +1437,11 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -1504,11 +1504,11 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -1584,7 +1584,7 @@ static void compact_inverted_rc_track_left_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -1636,7 +1636,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -1819,7 +1819,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -2021,7 +2021,7 @@ static void compact_inverted_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2194,7 +2194,7 @@ static void compact_inverted_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2388,7 +2388,7 @@ static void compact_inverted_rc_track_left_vertical_loop(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -2693,7 +2693,7 @@ static void compact_inverted_rc_track_right_vertical_loop(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -2978,7 +2978,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3107,7 +3107,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3236,7 +3236,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -3331,7 +3331,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -3447,7 +3447,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3566,7 +3566,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3679,7 +3679,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -3798,7 +3798,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -3938,7 +3938,7 @@ static void compact_inverted_rc_track_half_loop_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -4025,7 +4025,7 @@ static void compact_inverted_rc_track_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4084,7 +4084,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
break;
@ -4202,7 +4202,7 @@ static void compact_inverted_rc_track_right_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
break;
@ -4432,7 +4432,7 @@ static void compact_inverted_rc_track_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -4476,7 +4476,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -4659,7 +4659,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -4842,7 +4842,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5025,7 +5025,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5221,7 +5221,7 @@ static void compact_inverted_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -5366,7 +5366,7 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(
@ -5519,7 +5519,7 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5569,7 +5569,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5730,7 +5730,7 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5909,7 +5909,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -6071,7 +6071,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -8872,7 +8872,7 @@ static void compact_inverted_rc_track_block_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}

130
src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp
View File

@ -87,7 +87,7 @@ static void corkscrew_rc_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -123,7 +123,7 @@ static void corkscrew_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -195,11 +195,11 @@ static void corkscrew_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -273,11 +273,11 @@ static void corkscrew_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -351,11 +351,11 @@ static void corkscrew_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -441,11 +441,11 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -531,11 +531,11 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -609,11 +609,11 @@ static void corkscrew_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -702,7 +702,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -890,7 +890,7 @@ static void corkscrew_rc_track_flat_to_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -934,7 +934,7 @@ static void corkscrew_rc_track_flat_to_right_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -978,7 +978,7 @@ static void corkscrew_rc_track_left_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1022,7 +1022,7 @@ static void corkscrew_rc_track_right_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1065,7 +1065,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1258,11 +1258,11 @@ static void corkscrew_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1309,11 +1309,11 @@ static void corkscrew_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1360,11 +1360,11 @@ static void corkscrew_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1411,11 +1411,11 @@ static void corkscrew_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1486,7 +1486,7 @@ static void corkscrew_rc_track_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1534,7 +1534,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1709,7 +1709,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1902,7 +1902,7 @@ static void corkscrew_rc_track_s_bend_left(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2051,7 +2051,7 @@ static void corkscrew_rc_track_s_bend_right(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2207,7 +2207,7 @@ static void corkscrew_rc_track_left_vertical_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -2497,7 +2497,7 @@ static void corkscrew_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
break;
@ -2754,7 +2754,7 @@ static void corkscrew_rc_track_left_quarter_turn_3(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2878,7 +2878,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3002,7 +3002,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3089,7 +3089,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3201,7 +3201,7 @@ static void corkscrew_rc_track_half_loop_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3298,7 +3298,7 @@ static void corkscrew_rc_track_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3351,7 +3351,7 @@ static void corkscrew_rc_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3461,7 +3461,7 @@ static void corkscrew_rc_track_right_corkscrew_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3593,7 +3593,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3776,7 +3776,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3823,7 +3823,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4006,7 +4006,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4082,7 +4082,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4391,7 +4391,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4438,7 +4438,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4747,7 +4747,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4916,7 +4916,7 @@ static void corkscrew_rc_track_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4967,7 +4967,7 @@ static void corkscrew_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -5010,7 +5010,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5165,7 +5165,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5332,7 +5332,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5477,7 +5477,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5640,7 +5640,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5785,7 +5785,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8916,7 +8916,7 @@ static void corkscrew_rc_track_block_brakes(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_CorkscrewRCBlockBrakeImages[direction][isClosed]),
{ 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8962,7 +8962,7 @@ static void corkscrew_rc_track_booster(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -9002,7 +9002,7 @@ static void corkscrew_rc_track_left_twist_down_to_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -9119,7 +9119,7 @@ static void corkscrew_rc_track_right_twist_down_to_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -9241,7 +9241,7 @@ static void corkscrew_rc_track_left_twist_up_to_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -9358,7 +9358,7 @@ static void corkscrew_rc_track_right_twist_up_to_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;

352
src/openrct2/ride/coaster/FlyingRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

190
src/openrct2/ride/coaster/GigaCoaster.cpp
View File

@ -118,7 +118,7 @@ static void giga_rc_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -153,7 +153,7 @@ static void giga_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -255,11 +255,11 @@ static void giga_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -333,11 +333,11 @@ static void giga_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -441,11 +441,11 @@ static void giga_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -531,11 +531,11 @@ static void giga_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -621,11 +621,11 @@ static void giga_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -729,11 +729,11 @@ static void giga_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -822,7 +822,7 @@ static void giga_rc_track_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1010,7 +1010,7 @@ static void giga_rc_track_flat_to_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1054,7 +1054,7 @@ static void giga_rc_track_flat_to_right_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1098,7 +1098,7 @@ static void giga_rc_track_left_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1142,7 +1142,7 @@ static void giga_rc_track_right_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1185,7 +1185,7 @@ static void giga_rc_track_banked_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1378,11 +1378,11 @@ static void giga_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1429,11 +1429,11 @@ static void giga_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1480,11 +1480,11 @@ static void giga_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1531,11 +1531,11 @@ static void giga_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1606,7 +1606,7 @@ static void giga_rc_track_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1654,7 +1654,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1829,7 +1829,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2022,7 +2022,7 @@ static void giga_rc_track_s_bend_left(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2171,7 +2171,7 @@ static void giga_rc_track_s_bend_right(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2320,7 +2320,7 @@ static void giga_rc_track_left_quarter_turn_3(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2444,7 +2444,7 @@ static void giga_rc_track_left_quarter_turn_3_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2568,7 +2568,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2655,7 +2655,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2770,7 +2770,7 @@ static void giga_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2953,7 +2953,7 @@ static void giga_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3000,7 +3000,7 @@ static void giga_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3183,7 +3183,7 @@ static void giga_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3258,7 +3258,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3567,7 +3567,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3614,7 +3614,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3937,7 +3937,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4111,7 +4111,7 @@ static void giga_rc_track_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4151,11 +4151,11 @@ static void giga_rc_track_25_deg_up_left_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4196,11 +4196,11 @@ static void giga_rc_track_25_deg_up_right_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4252,7 +4252,7 @@ static void giga_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -4345,7 +4345,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4602,7 +4602,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4773,11 +4773,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4814,11 +4814,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4861,11 +4861,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4902,11 +4902,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4949,7 +4949,7 @@ static void giga_rc_track_left_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5094,7 +5094,7 @@ static void giga_rc_track_right_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5257,7 +5257,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5402,7 +5402,7 @@ static void giga_rc_track_right_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8120,7 +8120,7 @@ static void giga_rc_track_block_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8160,7 +8160,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8247,7 +8247,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8360,7 +8360,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8535,7 +8535,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8732,11 +8732,11 @@ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8780,11 +8780,11 @@ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8828,11 +8828,11 @@ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8876,11 +8876,11 @@ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8953,11 +8953,11 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8998,11 +8998,11 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9043,11 +9043,11 @@ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9088,11 +9088,11 @@ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9172,11 +9172,11 @@ static void giga_rc_track_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9220,11 +9220,11 @@ static void giga_rc_track_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9268,11 +9268,11 @@ static void giga_rc_track_left_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9316,11 +9316,11 @@ static void giga_rc_track_right_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9388,7 +9388,7 @@ static void giga_rc_track_booster(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

52
src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp
View File

@ -91,7 +91,7 @@ static void heartline_twister_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -115,7 +115,7 @@ static void heartline_twister_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -211,11 +211,11 @@ static void heartline_twister_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -312,11 +312,11 @@ static void heartline_twister_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20);
@ -413,11 +413,11 @@ static void heartline_twister_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -514,11 +514,11 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -615,11 +615,11 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -716,11 +716,11 @@ static void heartline_twister_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -823,11 +823,11 @@ static void heartline_twister_rc_track_heartline_transfer_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -980,11 +980,11 @@ static void heartline_twister_rc_track_heartline_transfer_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 16, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1037,11 +1037,11 @@ static void heartline_twister_rc_track_heartline_transfer_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 16, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1198,11 +1198,11 @@ static void heartline_twister_rc_track_heartline_transfer_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -1257,7 +1257,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -1473,7 +1473,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -1527,7 +1527,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -1743,7 +1743,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;

200
src/openrct2/ride/coaster/HybridCoaster.cpp
View File

@ -51,7 +51,7 @@ namespace HybridRC
{ 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -84,7 +84,7 @@ namespace HybridRC
track_paint_util_draw_narrow_station_platform(session, ride, direction, height, 10, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -108,11 +108,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -162,11 +162,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20);
@ -191,11 +191,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -272,11 +272,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -354,11 +354,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -383,11 +383,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -513,7 +513,7 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
@ -603,7 +603,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 80, 0x20);
@ -649,7 +649,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -776,7 +776,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -984,7 +984,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1136,7 +1136,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3213,7 +3213,7 @@ namespace HybridRC
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -3252,7 +3252,7 @@ namespace HybridRC
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -3307,11 +3307,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -3353,11 +3353,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -3399,11 +3399,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -3445,11 +3445,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -3517,7 +3517,7 @@ namespace HybridRC
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -4897,7 +4897,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5036,7 +5036,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5259,7 +5259,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5423,7 +5423,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5599,7 +5599,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -5706,7 +5706,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -5829,7 +5829,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -6029,7 +6029,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -6457,11 +6457,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -6500,11 +6500,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -6543,11 +6543,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -6586,11 +6586,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -6660,11 +6660,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -6706,11 +6706,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -6752,11 +6752,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -6798,11 +6798,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -6866,11 +6866,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -6906,11 +6906,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -6963,11 +6963,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -7006,11 +7006,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -7049,11 +7049,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -7092,11 +7092,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -7174,7 +7174,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -7301,7 +7301,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -7444,7 +7444,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -7688,7 +7688,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -7940,7 +7940,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8094,7 +8094,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8254,7 +8254,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8487,7 +8487,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8537,7 +8537,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8770,7 +8770,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8846,7 +8846,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -9217,7 +9217,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -9267,7 +9267,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -9638,7 +9638,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -9717,7 +9717,7 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -9859,7 +9859,7 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -10009,7 +10009,7 @@ namespace HybridRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
@ -10148,7 +10148,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
@ -10301,7 +10301,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
@ -10485,7 +10485,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
@ -10769,7 +10769,7 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -10792,7 +10792,7 @@ namespace HybridRC
session, direction, GetTrackColour(session).WithIndex(SPR_G2_HYBRID_TRACK_BRAKE + (direction & 1)),
{ 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -10808,7 +10808,7 @@ namespace HybridRC
{ 32, 20, 0 }, { 0, 6, height + 3 });
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -10847,7 +10847,7 @@ namespace HybridRC
session, direction & 1, 50 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -10985,7 +10985,7 @@ namespace HybridRC
session, direction & 1, 66 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 80, 0x20);
@ -11111,7 +11111,7 @@ namespace HybridRC
session, direction, GetTrackColour(session).WithIndex(SPR_G2_HYBRID_TRACK_BLOCK_BRAKE + (direction & 1)),
{ 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -11124,7 +11124,7 @@ namespace HybridRC
session, direction, GetTrackColour(session).WithIndex(SPR_G2_HYBRID_TRACK_BOOSTER + (direction & 1)),
{ 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -11139,11 +11139,11 @@ namespace HybridRC
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -11188,7 +11188,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
@ -11302,7 +11302,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
@ -11417,7 +11417,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
@ -11531,7 +11531,7 @@ namespace HybridRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);

46
src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp
View File

@ -76,7 +76,7 @@ static void inverted_hairpin_rc_track_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -103,7 +103,7 @@ static void inverted_hairpin_rc_track_station(
{ 32, 20, 1 }, { 0, 6, height + 24 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -193,11 +193,11 @@ static void inverted_hairpin_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -261,11 +261,11 @@ static void inverted_hairpin_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -357,11 +357,11 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -437,11 +437,11 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -545,11 +545,11 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -639,11 +639,11 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
}
@ -736,7 +736,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -865,7 +865,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -960,7 +960,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -1164,11 +1164,11 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1269,11 +1269,11 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -1323,7 +1323,7 @@ static void inverted_hairpin_rc_track_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1356,7 +1356,7 @@ static void inverted_hairpin_rc_track_block_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}

32
src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp
View File

@ -47,7 +47,7 @@ static void inverted_impulse_rc_track_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -74,7 +74,7 @@ static void inverted_impulse_rc_track_station(
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -135,11 +135,11 @@ static void inverted_impulse_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -174,11 +174,11 @@ static void inverted_impulse_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -238,11 +238,11 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -283,11 +283,11 @@ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -330,11 +330,11 @@ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -394,11 +394,11 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -533,7 +533,7 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(
@ -628,7 +628,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

188
src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
View File

@ -67,7 +67,7 @@ static void inverted_rc_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -94,7 +94,7 @@ static void inverted_rc_track_station(
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -184,11 +184,11 @@ static void inverted_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -223,11 +223,11 @@ static void inverted_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -319,11 +319,11 @@ static void inverted_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -364,11 +364,11 @@ static void inverted_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -437,11 +437,11 @@ static void inverted_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
}
@ -531,11 +531,11 @@ static void inverted_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -628,7 +628,7 @@ static void inverted_rc_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -818,7 +818,7 @@ static void inverted_rc_track_flat_to_left_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -860,7 +860,7 @@ static void inverted_rc_track_flat_to_right_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -902,7 +902,7 @@ static void inverted_rc_track_left_bank_to_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -944,7 +944,7 @@ static void inverted_rc_track_right_bank_to_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -988,7 +988,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1198,11 +1198,11 @@ static void inverted_rc_track_left_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -1265,11 +1265,11 @@ static void inverted_rc_track_right_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -1332,11 +1332,11 @@ static void inverted_rc_track_25_deg_up_to_left_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -1399,11 +1399,11 @@ static void inverted_rc_track_25_deg_up_to_right_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -1478,7 +1478,7 @@ static void inverted_rc_track_left_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -1530,7 +1530,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -1713,7 +1713,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -1913,7 +1913,7 @@ static void inverted_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2086,7 +2086,7 @@ static void inverted_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2280,7 +2280,7 @@ static void inverted_rc_track_left_vertical_loop(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -2585,7 +2585,7 @@ static void inverted_rc_track_right_vertical_loop(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -2870,7 +2870,7 @@ static void inverted_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2999,7 +2999,7 @@ static void inverted_rc_track_left_quarter_turn_3_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3128,7 +3128,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -3223,7 +3223,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -3337,7 +3337,7 @@ static void inverted_rc_track_left_twist_down_to_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3455,7 +3455,7 @@ static void inverted_rc_track_right_twist_down_to_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3566,7 +3566,7 @@ static void inverted_rc_track_left_twist_up_to_down(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -3684,7 +3684,7 @@ static void inverted_rc_track_right_twist_up_to_down(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -3824,7 +3824,7 @@ static void inverted_rc_track_half_loop_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -3911,7 +3911,7 @@ static void inverted_rc_track_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3970,7 +3970,7 @@ static void inverted_rc_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
break;
@ -4088,7 +4088,7 @@ static void inverted_rc_track_right_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
break;
@ -4315,7 +4315,7 @@ static void inverted_rc_track_brakes(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -4359,7 +4359,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -4542,7 +4542,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -4725,7 +4725,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -4908,7 +4908,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5107,11 +5107,11 @@ static void inverted_rc_track_25_deg_up_left_banked(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -5172,11 +5172,11 @@ static void inverted_rc_track_25_deg_up_right_banked(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -5226,7 +5226,7 @@ static void inverted_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -5286,7 +5286,7 @@ static void inverted_rc_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5447,7 +5447,7 @@ static void inverted_rc_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5626,7 +5626,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -5788,7 +5788,7 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -8592,7 +8592,7 @@ static void inverted_rc_track_left_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8778,7 +8778,7 @@ static void inverted_rc_track_left_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -8822,7 +8822,7 @@ static void inverted_rc_track_right_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9008,7 +9008,7 @@ static void inverted_rc_track_right_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -9063,7 +9063,7 @@ static void inverted_rc_track_block_brakes(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -9107,7 +9107,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -9202,7 +9202,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -9317,7 +9317,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -9500,7 +9500,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -9719,11 +9719,11 @@ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -9784,11 +9784,11 @@ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -9849,11 +9849,11 @@ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -9914,11 +9914,11 @@ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -10015,11 +10015,11 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -10080,11 +10080,11 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -10145,11 +10145,11 @@ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -10210,11 +10210,11 @@ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -10311,11 +10311,11 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -10376,11 +10376,11 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -10441,11 +10441,11 @@ static void inverted_rc_track_left_banked_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -10506,11 +10506,11 @@ static void inverted_rc_track_right_banked_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}

10
src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
View File

@ -1849,7 +1849,7 @@ void junior_rc_paint_track_flat(
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(junior_rc_track_pieces_flat[EnumValue(chainType)][direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 });
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1931,7 +1931,7 @@ void junior_rc_paint_track_25_deg_up(
int8_t tunnelHeights[4] = { -8, 8, 8, -8 };
uint8_t tunnelType[4] = { TUNNEL_1, TUNNEL_2, TUNNEL_2, TUNNEL_1 };
paint_util_push_tunnel_rotated(session, direction, height + tunnelHeights[direction], tunnelType[direction]);
PaintUtilPushTunnelRotated(session, direction, height + tunnelHeights[direction], tunnelType[direction]);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1954,11 +1954,11 @@ void junior_rc_paint_track_flat_to_25_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 });
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
if (track_paint_util_should_paint_supports(session.MapPosition))
@ -5926,7 +5926,7 @@ static void junior_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3 + photoCameraOffset, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48 + photoCameraOffset, 0x20);
}

230
src/openrct2/ride/coaster/LayDownRollerCoaster.cpp
View File

@ -79,7 +79,7 @@ static void lay_down_rc_track_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -131,7 +131,7 @@ static void lay_down_rc_track_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -161,7 +161,7 @@ static void lay_down_rc_track_station(
{ 32, 20, 1 }, { 0, 6, height + 24 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
else
{
@ -189,7 +189,7 @@ static void lay_down_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -266,11 +266,11 @@ static void lay_down_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -358,11 +358,11 @@ static void lay_down_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -439,11 +439,11 @@ static void lay_down_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -476,11 +476,11 @@ static void lay_down_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -559,11 +559,11 @@ static void lay_down_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -651,11 +651,11 @@ static void lay_down_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -744,11 +744,11 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -787,11 +787,11 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -882,11 +882,11 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -951,11 +951,11 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -1032,11 +1032,11 @@ static void lay_down_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1124,11 +1124,11 @@ static void lay_down_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
}
@ -1219,7 +1219,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1399,7 +1399,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -1595,7 +1595,7 @@ static void lay_down_rc_track_flat_to_left_bank(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1636,7 +1636,7 @@ static void lay_down_rc_track_flat_to_left_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1682,7 +1682,7 @@ static void lay_down_rc_track_flat_to_right_bank(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1723,7 +1723,7 @@ static void lay_down_rc_track_flat_to_right_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1769,7 +1769,7 @@ static void lay_down_rc_track_left_bank_to_flat(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1810,7 +1810,7 @@ static void lay_down_rc_track_left_bank_to_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1856,7 +1856,7 @@ static void lay_down_rc_track_right_bank_to_flat(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1897,7 +1897,7 @@ static void lay_down_rc_track_right_bank_to_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1942,7 +1942,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2125,7 +2125,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -2323,11 +2323,11 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2388,11 +2388,11 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -2441,11 +2441,11 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2506,11 +2506,11 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -2559,11 +2559,11 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2624,11 +2624,11 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
}
@ -2677,11 +2677,11 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2742,11 +2742,11 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
}
@ -2819,7 +2819,7 @@ static void lay_down_rc_track_left_bank(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2860,7 +2860,7 @@ static void lay_down_rc_track_left_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -2910,7 +2910,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3090,7 +3090,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -3273,7 +3273,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3453,7 +3453,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -3654,7 +3654,7 @@ static void lay_down_rc_track_s_bend_left(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3807,7 +3807,7 @@ static void lay_down_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -3981,7 +3981,7 @@ static void lay_down_rc_track_s_bend_right(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4134,7 +4134,7 @@ static void lay_down_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -4312,7 +4312,7 @@ static void lay_down_rc_track_left_vertical_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -4603,7 +4603,7 @@ static void lay_down_rc_track_right_vertical_loop(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
break;
@ -4864,7 +4864,7 @@ static void lay_down_rc_track_left_quarter_turn_3(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4979,7 +4979,7 @@ static void lay_down_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -5109,7 +5109,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5227,7 +5227,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -5354,7 +5354,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5444,7 +5444,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -5537,7 +5537,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5633,7 +5633,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -5745,7 +5745,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -5931,7 +5931,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -5979,7 +5979,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -6165,7 +6165,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -6241,7 +6241,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -6553,7 +6553,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -6601,7 +6601,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -6913,7 +6913,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -7167,7 +7167,7 @@ static void lay_down_rc_track_brakes(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -7198,7 +7198,7 @@ static void lay_down_rc_track_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -7258,7 +7258,7 @@ static void lay_down_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -7312,7 +7312,7 @@ static void lay_down_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -7355,7 +7355,7 @@ static void lay_down_rc_track_left_eighth_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7503,7 +7503,7 @@ static void lay_down_rc_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -7665,7 +7665,7 @@ static void lay_down_rc_track_right_eighth_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7813,7 +7813,7 @@ static void lay_down_rc_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -7993,7 +7993,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8141,7 +8141,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -8303,7 +8303,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8451,7 +8451,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -14050,7 +14050,7 @@ static void lay_down_rc_track_left_flyer_twist_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -14169,7 +14169,7 @@ static void lay_down_rc_track_right_flyer_twist_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -14294,7 +14294,7 @@ static void lay_down_rc_track_left_flyer_twist_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -14413,7 +14413,7 @@ static void lay_down_rc_track_right_flyer_twist_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -14526,7 +14526,7 @@ static void lay_down_rc_track_flyer_half_loop_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -14623,7 +14623,7 @@ static void lay_down_rc_track_flyer_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -14665,7 +14665,7 @@ static void lay_down_rc_track_flyer_half_loop_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -14764,7 +14764,7 @@ static void lay_down_rc_track_flyer_half_loop_down(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -14822,7 +14822,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -14933,7 +14933,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -15052,7 +15052,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -15158,7 +15158,7 @@ static void lay_down_rc_track_block_brakes(
}
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -15189,7 +15189,7 @@ static void lay_down_rc_track_block_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -15233,7 +15233,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -15415,7 +15415,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -15597,7 +15597,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -15779,7 +15779,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -15976,7 +15976,7 @@ static void lay_down_rc_track_half_loop_inverted_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
break;
@ -16063,7 +16063,7 @@ static void lay_down_rc_track_half_loop_inverted_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

86
src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp
View File

@ -60,7 +60,7 @@ static void lim_launched_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -106,7 +106,7 @@ static void lim_launched_rc_track_left_vertical_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -380,7 +380,7 @@ static void lim_launched_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
break;
@ -633,7 +633,7 @@ static void lim_launched_rc_track_left_twist_down_to_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -781,7 +781,7 @@ static void lim_launched_rc_track_right_twist_down_to_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -928,7 +928,7 @@ static void lim_launched_rc_track_left_twist_up_to_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 32, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 32, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -1076,7 +1076,7 @@ static void lim_launched_rc_track_right_twist_up_to_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_INVERTED_3);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -1215,7 +1215,7 @@ static void lim_launched_rc_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1325,7 +1325,7 @@ static void lim_launched_rc_track_right_corkscrew_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -1444,7 +1444,7 @@ static void lim_launched_rc_track_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1532,7 +1532,7 @@ static void lim_launched_rc_track_60_deg_up_to_90_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(
@ -1627,7 +1627,7 @@ static void lim_launched_rc_track_60_deg_down_to_90_deg_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1727,7 +1727,7 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -1759,7 +1759,7 @@ static void lim_launched_rc_track_block_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1936,7 +1936,7 @@ static void lim_launched_rc_track_left_barrel_roll_up_to_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2114,7 +2114,7 @@ static void lim_launched_rc_track_right_barrel_roll_up_to_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2285,7 +2285,7 @@ static void lim_launched_rc_track_half_loop_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2394,7 +2394,7 @@ static void lim_launched_rc_track_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2451,7 +2451,7 @@ static void lim_launched_rc_track_flat_to_60_deg_up_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2620,7 +2620,7 @@ static void lim_launched_rc_track_60_deg_up_to_flat_long_base(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2804,7 +2804,7 @@ static void lim_launched_rc_track_left_large_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3017,7 +3017,7 @@ static void lim_launched_rc_track_right_large_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D4 | SEGMENT_C4 | SEGMENT_BC | SEGMENT_CC | SEGMENT_D0, direction),
@ -3243,7 +3243,7 @@ static void lim_launched_rc_track_left_medium_half_loop_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3392,7 +3392,7 @@ static void lim_launched_rc_track_left_medium_half_loop_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3438,7 +3438,7 @@ static void lim_launched_rc_track_right_medium_half_loop_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3587,7 +3587,7 @@ static void lim_launched_rc_track_right_medium_half_loop_up(
0xFFFF, 0);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3661,7 +3661,7 @@ static void lim_launched_rc_track_left_zero_g_roll_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3809,7 +3809,7 @@ static void lim_launched_rc_track_right_zero_g_roll_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3960,7 +3960,7 @@ static void lim_launched_rc_track_left_large_zero_g_roll_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 25, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4139,7 +4139,7 @@ static void lim_launched_rc_track_right_large_zero_g_roll_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 25, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4335,7 +4335,7 @@ static void lim_launched_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4434,7 +4434,7 @@ static void lim_launched_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4530,7 +4530,7 @@ static void lim_launched_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
session, METAL_SUPPORTS_TUBES, 4, 8, height - 6, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4629,7 +4629,7 @@ static void lim_launched_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank
session, METAL_SUPPORTS_TUBES, 4, 8, height - 6, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4727,7 +4727,7 @@ static void lim_launched_rc_track_left_large_half_loop_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4945,7 +4945,7 @@ static void lim_launched_rc_track_left_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -4993,7 +4993,7 @@ static void lim_launched_rc_track_right_large_half_loop_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5211,7 +5211,7 @@ static void lim_launched_rc_track_right_large_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -5283,11 +5283,11 @@ static void lim_launched_rc_track_flat_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5336,11 +5336,11 @@ static void lim_launched_rc_track_60_deg_up_to_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5706,7 +5706,7 @@ static void lim_launched_rc_track_booster(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

174
src/openrct2/ride/coaster/LoopingRollerCoaster.cpp
View File

@ -81,7 +81,7 @@ static void looping_rc_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -113,7 +113,7 @@ static void looping_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -185,11 +185,11 @@ static void looping_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -263,11 +263,11 @@ static void looping_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -341,11 +341,11 @@ static void looping_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -431,11 +431,11 @@ static void looping_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -521,11 +521,11 @@ static void looping_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -599,11 +599,11 @@ static void looping_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -692,7 +692,7 @@ static void looping_rc_track_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -880,7 +880,7 @@ static void looping_rc_track_flat_to_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -924,7 +924,7 @@ static void looping_rc_track_flat_to_right_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -968,7 +968,7 @@ static void looping_rc_track_left_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1012,7 +1012,7 @@ static void looping_rc_track_right_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1055,7 +1055,7 @@ static void looping_rc_track_banked_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1248,11 +1248,11 @@ static void looping_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1299,11 +1299,11 @@ static void looping_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1350,11 +1350,11 @@ static void looping_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1401,11 +1401,11 @@ static void looping_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1476,7 +1476,7 @@ static void looping_rc_track_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1524,7 +1524,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1699,7 +1699,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1892,7 +1892,7 @@ static void looping_rc_track_s_bend_left(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2041,7 +2041,7 @@ static void looping_rc_track_s_bend_right(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2189,7 +2189,7 @@ static void looping_rc_track_left_vertical_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -2494,7 +2494,7 @@ static void looping_rc_track_right_vertical_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
break;
@ -2774,7 +2774,7 @@ static void looping_rc_track_left_quarter_turn_3(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2898,7 +2898,7 @@ static void looping_rc_track_left_quarter_turn_3_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3022,7 +3022,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3109,7 +3109,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3224,7 +3224,7 @@ static void looping_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3407,7 +3407,7 @@ static void looping_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3454,7 +3454,7 @@ static void looping_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3637,7 +3637,7 @@ static void looping_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3712,7 +3712,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4021,7 +4021,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4068,7 +4068,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4377,7 +4377,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4551,7 +4551,7 @@ static void looping_rc_track_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4591,11 +4591,11 @@ static void looping_rc_track_25_deg_up_left_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4636,11 +4636,11 @@ static void looping_rc_track_25_deg_up_right_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4696,7 +4696,7 @@ static void looping_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -4751,7 +4751,7 @@ static void looping_rc_track_left_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4896,7 +4896,7 @@ static void looping_rc_track_right_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5059,7 +5059,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5204,7 +5204,7 @@ static void looping_rc_track_right_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8355,7 +8355,7 @@ static void looping_rc_track_block_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8395,7 +8395,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8482,7 +8482,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8596,7 +8596,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8771,7 +8771,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8969,11 +8969,11 @@ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9017,11 +9017,11 @@ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9065,11 +9065,11 @@ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9113,11 +9113,11 @@ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9194,11 +9194,11 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9239,11 +9239,11 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9284,11 +9284,11 @@ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9329,11 +9329,11 @@ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9413,11 +9413,11 @@ static void looping_rc_track_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9461,11 +9461,11 @@ static void looping_rc_track_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9509,11 +9509,11 @@ static void looping_rc_track_left_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9557,11 +9557,11 @@ static void looping_rc_track_right_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9623,7 +9623,7 @@ static void looping_rc_track_booster(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

80
src/openrct2/ride/coaster/MineRide.cpp
View File

@ -47,7 +47,7 @@ static void mine_ride_track_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -72,7 +72,7 @@ static void mine_ride_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -127,11 +127,11 @@ static void mine_ride_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -186,11 +186,11 @@ static void mine_ride_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -247,11 +247,11 @@ static void mine_ride_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -323,7 +323,7 @@ static void mine_ride_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -532,7 +532,7 @@ static void mine_ride_track_flat_to_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -590,7 +590,7 @@ static void mine_ride_track_flat_to_right_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -648,7 +648,7 @@ static void mine_ride_track_left_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -706,7 +706,7 @@ static void mine_ride_track_right_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -756,7 +756,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -970,11 +970,11 @@ static void mine_ride_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1035,11 +1035,11 @@ static void mine_ride_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1102,11 +1102,11 @@ static void mine_ride_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1169,11 +1169,11 @@ static void mine_ride_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1258,7 +1258,7 @@ static void mine_ride_track_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1313,7 +1313,7 @@ static void mine_ride_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1476,7 +1476,7 @@ static void mine_ride_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1639,7 +1639,7 @@ static void mine_ride_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1777,7 +1777,7 @@ static void mine_ride_track_left_quarter_turn_3_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1918,7 +1918,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2122,7 +2122,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2176,7 +2176,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2380,7 +2380,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2462,7 +2462,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2792,7 +2792,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2846,7 +2846,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3176,7 +3176,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3259,7 +3259,7 @@ static void mine_ride_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -3305,7 +3305,7 @@ static void mine_ride_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3457,7 +3457,7 @@ static void mine_ride_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3627,7 +3627,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3779,7 +3779,7 @@ static void mine_ride_track_right_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

104
src/openrct2/ride/coaster/MineTrainCoaster.cpp
View File

@ -85,7 +85,7 @@ static void mine_train_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -120,7 +120,7 @@ static void mine_train_rc_track_station(
}
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -192,11 +192,11 @@ static void mine_train_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -236,11 +236,11 @@ static void mine_train_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20);
@ -313,11 +313,11 @@ static void mine_train_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -363,11 +363,11 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -413,11 +413,11 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -490,11 +490,11 @@ static void mine_train_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -585,7 +585,7 @@ static void mine_train_rc_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -794,7 +794,7 @@ static void mine_train_rc_track_flat_to_left_bank(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -837,7 +837,7 @@ static void mine_train_rc_track_flat_to_right_bank(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -880,7 +880,7 @@ static void mine_train_rc_track_left_bank_to_flat(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -923,7 +923,7 @@ static void mine_train_rc_track_right_bank_to_flat(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -968,7 +968,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1182,11 +1182,11 @@ static void mine_train_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -1232,11 +1232,11 @@ static void mine_train_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -1282,11 +1282,11 @@ static void mine_train_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -1332,11 +1332,11 @@ static void mine_train_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -1406,7 +1406,7 @@ static void mine_train_rc_track_left_bank(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1456,7 +1456,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -1655,7 +1655,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -1872,7 +1872,7 @@ static void mine_train_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2025,7 +2025,7 @@ static void mine_train_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2178,7 +2178,7 @@ static void mine_train_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2321,7 +2321,7 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2464,7 +2464,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -2572,7 +2572,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -2701,7 +2701,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -2929,7 +2929,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -2981,7 +2981,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -3209,7 +3209,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -3291,7 +3291,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -3663,7 +3663,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -3715,7 +3715,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -4075,7 +4075,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -4139,7 +4139,7 @@ static void mine_train_rc_track_brakes(
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -4177,7 +4177,7 @@ static void mine_train_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 2, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -4219,7 +4219,7 @@ static void mine_train_rc_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4372,7 +4372,7 @@ static void mine_train_rc_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4543,7 +4543,7 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4696,7 +4696,7 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -7510,7 +7510,7 @@ static void mine_train_rc_track_block_brakes(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_MineTrainBlockBrakeImages[direction][isClosed]),
{ 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}

174
src/openrct2/ride/coaster/MiniRollerCoaster.cpp
View File

@ -109,7 +109,7 @@ static void mini_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -144,7 +144,7 @@ static void mini_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -248,11 +248,11 @@ static void mini_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -309,11 +309,11 @@ static void mini_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -419,11 +419,11 @@ static void mini_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -486,11 +486,11 @@ static void mini_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -553,11 +553,11 @@ static void mini_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -663,11 +663,11 @@ static void mini_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -763,7 +763,7 @@ static void mini_rc_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -972,7 +972,7 @@ static void mini_rc_track_flat_to_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1030,7 +1030,7 @@ static void mini_rc_track_flat_to_right_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1088,7 +1088,7 @@ static void mini_rc_track_left_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1146,7 +1146,7 @@ static void mini_rc_track_right_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1196,7 +1196,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1410,11 +1410,11 @@ static void mini_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1475,11 +1475,11 @@ static void mini_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1542,11 +1542,11 @@ static void mini_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1609,11 +1609,11 @@ static void mini_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1698,7 +1698,7 @@ static void mini_rc_track_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1753,7 +1753,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1942,7 +1942,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2149,7 +2149,7 @@ static void mini_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2312,7 +2312,7 @@ static void mini_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2475,7 +2475,7 @@ static void mini_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2613,7 +2613,7 @@ static void mini_rc_track_left_quarter_turn_3_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2751,7 +2751,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2852,7 +2852,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2974,7 +2974,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3178,7 +3178,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3232,7 +3232,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3436,7 +3436,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3518,7 +3518,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3848,7 +3848,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3902,7 +3902,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4232,7 +4232,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4405,7 +4405,7 @@ static void mini_rc_track_brakes(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4461,11 +4461,11 @@ static void mini_rc_track_25_deg_up_left_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4522,11 +4522,11 @@ static void mini_rc_track_25_deg_up_right_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4578,7 +4578,7 @@ static void mini_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -4640,7 +4640,7 @@ static void mini_rc_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4792,7 +4792,7 @@ static void mini_rc_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4962,7 +4962,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5114,7 +5114,7 @@ static void mini_rc_track_right_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7842,7 +7842,7 @@ static void mini_rc_track_block_brakes(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -7889,7 +7889,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7990,7 +7990,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8110,7 +8110,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8299,7 +8299,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8519,11 +8519,11 @@ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8583,11 +8583,11 @@ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8647,11 +8647,11 @@ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8711,11 +8711,11 @@ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8802,11 +8802,11 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8861,11 +8861,11 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8922,11 +8922,11 @@ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8983,11 +8983,11 @@ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9081,11 +9081,11 @@ static void mini_rc_track_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9143,11 +9143,11 @@ static void mini_rc_track_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9207,11 +9207,11 @@ static void mini_rc_track_left_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9271,11 +9271,11 @@ static void mini_rc_track_right_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9354,7 +9354,7 @@ static void mini_rc_track_left_curved_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9454,7 +9454,7 @@ static void mini_rc_track_right_curved_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9548,7 +9548,7 @@ static void mini_rc_track_booster(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

28
src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp
View File

@ -79,7 +79,7 @@ static void mini_suspended_rc_track_flat(
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -106,7 +106,7 @@ static void mini_suspended_rc_track_station(
{ 32, 20, 1 }, { 0, 2, height });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -196,11 +196,11 @@ static void mini_suspended_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -290,11 +290,11 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -384,11 +384,11 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -468,7 +468,7 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -681,7 +681,7 @@ static void mini_suspended_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -876,7 +876,7 @@ static void mini_suspended_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1072,7 +1072,7 @@ static void mini_suspended_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -1222,7 +1222,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1395,7 +1395,7 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;

206
src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp
View File

@ -86,7 +86,7 @@ static void multi_dimension_rc_track_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -116,7 +116,7 @@ static void multi_dimension_rc_track_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -173,7 +173,7 @@ static void multi_dimension_rc_track_station(
track_paint_util_draw_station_covers(session, EDGE_SW, hasFence, stationObj, height);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -249,11 +249,11 @@ static void multi_dimension_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -311,11 +311,11 @@ static void multi_dimension_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -358,11 +358,11 @@ static void multi_dimension_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20);
@ -394,11 +394,11 @@ static void multi_dimension_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -477,11 +477,11 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -539,11 +539,11 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -592,11 +592,11 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -634,11 +634,11 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -689,11 +689,11 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -757,11 +757,11 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -838,11 +838,11 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -900,11 +900,11 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
}
@ -995,7 +995,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1174,7 +1174,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -1370,7 +1370,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1410,7 +1410,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1456,7 +1456,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1496,7 +1496,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1542,7 +1542,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1582,7 +1582,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1628,7 +1628,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1668,7 +1668,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -1713,7 +1713,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1895,7 +1895,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -2094,11 +2094,11 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -2158,11 +2158,11 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -2211,11 +2211,11 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -2275,11 +2275,11 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -2328,11 +2328,11 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -2392,11 +2392,11 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
}
@ -2445,11 +2445,11 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -2509,11 +2509,11 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
}
@ -2586,7 +2586,7 @@ static void multi_dimension_rc_track_left_bank(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -2626,7 +2626,7 @@ static void multi_dimension_rc_track_left_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -2676,7 +2676,7 @@ static void multi_dimension_rc_track_s_bend_left(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2819,7 +2819,7 @@ static void multi_dimension_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -2993,7 +2993,7 @@ static void multi_dimension_rc_track_s_bend_right(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3136,7 +3136,7 @@ static void multi_dimension_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -3310,7 +3310,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3424,7 +3424,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -3554,7 +3554,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3671,7 +3671,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -3799,7 +3799,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3981,7 +3981,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4027,7 +4027,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4209,7 +4209,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4285,7 +4285,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4593,7 +4593,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4639,7 +4639,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4947,7 +4947,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5012,7 +5012,7 @@ static void multi_dimension_rc_track_brakes(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -5042,7 +5042,7 @@ static void multi_dimension_rc_track_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -5102,7 +5102,7 @@ static void multi_dimension_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -5156,7 +5156,7 @@ static void multi_dimension_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -5286,7 +5286,7 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(
@ -5327,7 +5327,7 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(
@ -5466,7 +5466,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5506,7 +5506,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5555,7 +5555,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5694,7 +5694,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -5856,7 +5856,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5995,7 +5995,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -6175,7 +6175,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -6314,7 +6314,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -6476,7 +6476,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -6615,7 +6615,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -11797,7 +11797,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -11916,7 +11916,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -12041,7 +12041,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -12160,7 +12160,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
break;
@ -12273,7 +12273,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -12369,7 +12369,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -12458,7 +12458,7 @@ static void multi_dimension_rc_track_block_brakes(
{ 32, 20, 3 }, { 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -12483,7 +12483,7 @@ static void multi_dimension_rc_track_block_brakes(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
}
@ -12579,7 +12579,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -12673,7 +12673,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -12718,7 +12718,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -12814,7 +12814,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -12973,7 +12973,7 @@ static void multi_dimension_rc_track_multidim_inverted_90_deg_up_to_flat_quarter
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -13067,7 +13067,7 @@ static void multi_dimension_rc_track_multidim_inverted_90_deg_up_to_flat_quarter
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);

2
src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp
View File

@ -415,7 +415,7 @@ static void paint_reverse_freefall_rc_onride_photo(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

30
src/openrct2/ride/coaster/ReverserRollerCoaster.cpp
View File

@ -90,7 +90,7 @@ static void reverser_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -114,7 +114,7 @@ static void reverser_rc_track_station(
{ 32, 27, 2 }, { 0, 2, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -186,11 +186,11 @@ static void reverser_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -263,11 +263,11 @@ static void reverser_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -340,11 +340,11 @@ static void reverser_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -411,7 +411,7 @@ static void reverser_rc_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -619,7 +619,7 @@ static void reverser_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -772,7 +772,7 @@ static void reverser_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -925,7 +925,7 @@ static void reverser_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1035,7 +1035,7 @@ static void reverser_rc_track_brakes(
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1077,7 +1077,7 @@ static void reverser_rc_track_left_reverser(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1286,7 +1286,7 @@ static void reverser_rc_track_right_reverser(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

42
src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp
View File

@ -138,7 +138,7 @@ static void side_friction_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -160,7 +160,7 @@ static void side_friction_rc_track_station(
{ 0, 2, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -256,11 +256,11 @@ static void side_friction_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -357,11 +357,11 @@ static void side_friction_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -458,11 +458,11 @@ static void side_friction_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -541,7 +541,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -809,7 +809,7 @@ static void side_friction_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1010,7 +1010,7 @@ static void side_friction_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1211,7 +1211,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1351,7 +1351,7 @@ static void side_friction_rc_track_brakes(
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1405,7 +1405,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1606,7 +1606,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -2982,11 +2982,11 @@ static void side_friction_rc_track_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20);
@ -3053,11 +3053,11 @@ static void side_friction_rc_track_25_deg_up_to_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3124,11 +3124,11 @@ static void side_friction_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

230
src/openrct2/ride/coaster/SingleRailRollerCoaster.cpp
View File

@ -88,7 +88,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -122,7 +122,7 @@ namespace SingleRailRC
{ 32, 28, 2 }, { 0, 2, height });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 4, 7);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -201,11 +201,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -284,11 +284,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -367,11 +367,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -464,11 +464,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -561,11 +561,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -644,11 +644,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -789,7 +789,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetVerticalTunnel(session, height + 56);
PaintUtilSetSegmentSupportHeight(
@ -885,7 +885,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 48, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -934,7 +934,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1067,7 +1067,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1273,7 +1273,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1436,7 +1436,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3655,7 +3655,7 @@ namespace SingleRailRC
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3704,7 +3704,7 @@ namespace SingleRailRC
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3769,11 +3769,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3825,11 +3825,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3881,11 +3881,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3937,11 +3937,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4011,7 +4011,7 @@ namespace SingleRailRC
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5284,7 +5284,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5425,7 +5425,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5635,7 +5635,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5798,7 +5798,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5977,7 +5977,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6073,7 +6073,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6191,7 +6191,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6389,7 +6389,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6842,11 +6842,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6894,11 +6894,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6946,11 +6946,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -6998,11 +6998,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7074,11 +7074,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7122,11 +7122,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7170,11 +7170,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7218,11 +7218,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7294,11 +7294,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7342,11 +7342,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7408,11 +7408,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7460,11 +7460,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7512,11 +7512,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7564,11 +7564,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7645,7 +7645,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7749,7 +7749,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7875,7 +7875,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8093,7 +8093,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8323,7 +8323,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8491,7 +8491,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8663,7 +8663,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -8872,7 +8872,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -8924,7 +8924,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -9133,7 +9133,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -9211,7 +9211,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -9566,7 +9566,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -9617,7 +9617,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -9984,7 +9984,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -10080,7 +10080,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -10259,7 +10259,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -10430,7 +10430,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10540,7 +10540,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10579,7 +10579,7 @@ namespace SingleRailRC
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -10637,7 +10637,7 @@ namespace SingleRailRC
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -10683,7 +10683,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -10852,7 +10852,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -11020,7 +11020,7 @@ namespace SingleRailRC
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -11066,7 +11066,7 @@ namespace SingleRailRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -11191,7 +11191,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -11332,7 +11332,7 @@ namespace SingleRailRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -11549,7 +11549,7 @@ namespace SingleRailRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D4 | SEGMENT_C4 | SEGMENT_BC | SEGMENT_CC | SEGMENT_D0, direction),
@ -11795,7 +11795,7 @@ namespace SingleRailRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -11946,7 +11946,7 @@ namespace SingleRailRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -11993,7 +11993,7 @@ namespace SingleRailRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -12144,7 +12144,7 @@ namespace SingleRailRC
0xFFFF, 0);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -12218,7 +12218,7 @@ namespace SingleRailRC
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -12368,7 +12368,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -12522,7 +12522,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 25, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -12704,7 +12704,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 25, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -12959,7 +12959,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -13017,7 +13017,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -13117,7 +13117,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -13213,7 +13213,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height - 6, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -13313,7 +13313,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height - 6, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -13413,7 +13413,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -13634,7 +13634,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -13684,7 +13684,7 @@ namespace SingleRailRC
session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -13905,7 +13905,7 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -14029,11 +14029,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -14124,11 +14124,11 @@ namespace SingleRailRC
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

116
src/openrct2/ride/coaster/StandUpRollerCoaster.cpp
View File

@ -81,7 +81,7 @@ static void stand_up_rc_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -117,7 +117,7 @@ static void stand_up_rc_track_station(
{ 32, 32, 1 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -181,11 +181,11 @@ static void stand_up_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -255,11 +255,11 @@ static void stand_up_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -325,11 +325,11 @@ static void stand_up_rc_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -411,11 +411,11 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -497,11 +497,11 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -567,11 +567,11 @@ static void stand_up_rc_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -660,7 +660,7 @@ static void stand_up_rc_track_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -838,7 +838,7 @@ static void stand_up_rc_track_flat_to_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -872,7 +872,7 @@ static void stand_up_rc_track_flat_to_right_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -906,7 +906,7 @@ static void stand_up_rc_track_left_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -940,7 +940,7 @@ static void stand_up_rc_track_right_bank_to_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -983,7 +983,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1166,11 +1166,11 @@ static void stand_up_rc_track_left_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1207,11 +1207,11 @@ static void stand_up_rc_track_right_bank_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1248,11 +1248,11 @@ static void stand_up_rc_track_25_deg_up_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1289,11 +1289,11 @@ static void stand_up_rc_track_25_deg_up_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1360,7 +1360,7 @@ static void stand_up_rc_track_left_bank(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1440,7 +1440,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1766,7 +1766,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2078,7 +2078,7 @@ static void stand_up_rc_track_s_bend_left(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2227,7 +2227,7 @@ static void stand_up_rc_track_s_bend_right(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2376,7 +2376,7 @@ static void stand_up_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -2659,7 +2659,7 @@ static void stand_up_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
break;
@ -2916,7 +2916,7 @@ static void stand_up_rc_track_left_quarter_turn_3(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3040,7 +3040,7 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3196,7 +3196,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3347,7 +3347,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3496,7 +3496,7 @@ static void stand_up_rc_track_half_loop_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3593,7 +3593,7 @@ static void stand_up_rc_track_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3646,7 +3646,7 @@ static void stand_up_rc_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -3756,7 +3756,7 @@ static void stand_up_rc_track_right_corkscrew_up(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3888,7 +3888,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4071,7 +4071,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4118,7 +4118,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4301,7 +4301,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4376,7 +4376,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4685,7 +4685,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -4732,7 +4732,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -5041,7 +5041,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -5101,7 +5101,7 @@ static void stand_up_rc_track_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -5152,7 +5152,7 @@ static void stand_up_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -5191,7 +5191,7 @@ static void stand_up_rc_track_left_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5336,7 +5336,7 @@ static void stand_up_rc_track_right_eighth_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5499,7 +5499,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5644,7 +5644,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8779,7 +8779,7 @@ static void stand_up_rc_track_block_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

32
src/openrct2/ride/coaster/Steeplechase.cpp
View File

@ -63,7 +63,7 @@ static void steeplechase_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -88,7 +88,7 @@ static void steeplechase_track_station(
{ 32, 20, 3 }, { 0, 0, height });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -160,11 +160,11 @@ static void steeplechase_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -238,11 +238,11 @@ static void steeplechase_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -316,11 +316,11 @@ static void steeplechase_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -392,7 +392,7 @@ static void steeplechase_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -590,7 +590,7 @@ static void steeplechase_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -753,7 +753,7 @@ static void steeplechase_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -916,7 +916,7 @@ static void steeplechase_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1031,7 +1031,7 @@ static void steeplechase_track_brakes(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1078,7 +1078,7 @@ static void steeplechase_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1230,7 +1230,7 @@ static void steeplechase_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2400,7 +2400,7 @@ static void steeplechase_track_block_brakes(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

60
src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp
View File

@ -67,7 +67,7 @@ static void suspended_swinging_rc_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -94,7 +94,7 @@ static void suspended_swinging_rc_track_station(
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -184,11 +184,11 @@ static void suspended_swinging_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -223,11 +223,11 @@ static void suspended_swinging_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -319,11 +319,11 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -364,11 +364,11 @@ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -472,11 +472,11 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
}
@ -566,11 +566,11 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_13);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -663,7 +663,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -855,7 +855,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -1038,7 +1038,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -1240,7 +1240,7 @@ static void suspended_swinging_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1413,7 +1413,7 @@ static void suspended_swinging_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1587,7 +1587,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1716,7 +1716,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -1811,7 +1811,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
PaintUtilSetGeneralSupportHeight(session, height + 88, 0x20);
break;
@ -1914,7 +1914,7 @@ static void suspended_swinging_rc_track_brakes(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -1958,7 +1958,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2141,7 +2141,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2324,7 +2324,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2507,7 +2507,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2689,7 +2689,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -2851,7 +2851,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -4467,7 +4467,7 @@ static void suspended_swinging_rc_track_block_brakes(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}

42
src/openrct2/ride/coaster/WildMouse.cpp
View File

@ -182,7 +182,7 @@ static void wild_mouse_track_flat(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -219,7 +219,7 @@ static void wild_mouse_track_station(
}
track_paint_util_draw_station_metal_supports(session, direction, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -245,11 +245,11 @@ static void wild_mouse_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -291,11 +291,11 @@ static void wild_mouse_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -323,11 +323,11 @@ static void wild_mouse_track_flat_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -370,11 +370,11 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -417,11 +417,11 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -449,11 +449,11 @@ static void wild_mouse_track_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -796,11 +796,11 @@ static void wild_mouse_track_flat_to_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -850,11 +850,11 @@ static void wild_mouse_track_60_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -888,7 +888,7 @@ static void wild_mouse_track_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -912,7 +912,7 @@ static void wild_mouse_track_rotation_control_toggle(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -930,7 +930,7 @@ static void wild_mouse_track_block_brakes(
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

178
src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
View File

@ -477,7 +477,7 @@ static void wooden_rc_track_flat(
session, imageIds[direction][isChained], railsImageIds[direction][isChained], direction, 0, 2, 32, 25, 2, height, 0, 3,
height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -509,7 +509,7 @@ static void wooden_rc_track_station(
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -589,11 +589,11 @@ static void wooden_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -627,11 +627,11 @@ static void wooden_rc_track_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -713,11 +713,11 @@ static void wooden_rc_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -773,11 +773,11 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -833,11 +833,11 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -919,11 +919,11 @@ static void wooden_rc_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1417,7 +1417,7 @@ static void wooden_rc_track_flat_to_left_bank(
session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1463,7 +1463,7 @@ static void wooden_rc_track_flat_to_right_bank(
session, imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 1, 9, height, 0, 26, height + 5);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -1922,11 +1922,11 @@ static void wooden_rc_track_left_bank_to_25_deg_up(
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -1975,11 +1975,11 @@ static void wooden_rc_track_right_bank_to_25_deg_up(
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -2028,11 +2028,11 @@ static void wooden_rc_track_25_deg_up_to_left_bank(
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -2081,11 +2081,11 @@ static void wooden_rc_track_25_deg_up_to_right_bank(
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -2143,7 +2143,7 @@ static void wooden_rc_track_left_bank(
wooden_rc_track_paint<isClassic>(
session, imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3, height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -2213,7 +2213,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -2539,7 +2539,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -2893,7 +2893,7 @@ static void wooden_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3143,7 +3143,7 @@ static void wooden_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -3366,7 +3366,7 @@ static void wooden_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(
session,
@ -3650,7 +3650,7 @@ static void wooden_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
break;
@ -3935,7 +3935,7 @@ static void wooden_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4140,7 +4140,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -4352,7 +4352,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -4500,7 +4500,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -4676,7 +4676,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -5045,7 +5045,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -5125,7 +5125,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -5493,7 +5493,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -5599,7 +5599,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -6166,7 +6166,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -6240,7 +6240,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -6807,7 +6807,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -7027,7 +7027,7 @@ static void wooden_rc_track_brakes(
wooden_rc_track_paint<isClassic>(
session, imageIds[direction][0], imageIds[direction][1], direction, 0, 2, 32, 25, 2, height, 0, 3, height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -7091,11 +7091,11 @@ static void wooden_rc_track_25_deg_up_left_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -7160,11 +7160,11 @@ static void wooden_rc_track_25_deg_up_right_banked(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -7213,7 +7213,7 @@ static void wooden_rc_track_on_ride_photo(
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_onride_photo_small_paint(session, direction, height + 16, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -7349,7 +7349,7 @@ static void wooden_rc_track_water_splash(
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -7720,7 +7720,7 @@ static void wooden_rc_track_water_splash(
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -7789,7 +7789,7 @@ static void wooden_rc_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8039,7 +8039,7 @@ static void wooden_rc_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8309,7 +8309,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -8559,7 +8559,7 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -12297,7 +12297,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
@ -12445,7 +12445,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
@ -12599,7 +12599,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
@ -12747,7 +12747,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
@ -12838,7 +12838,7 @@ static void wooden_rc_track_block_brakes(
wooden_rc_track_paint<isClassic>(
session, brakeImg, _wooden_rc_block_brakes_image_ids[direction][2], direction, 0, 2, 32, 25, 2, height, 0, 3, height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -12905,7 +12905,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -13053,7 +13053,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -13217,7 +13217,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -13543,7 +13543,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -13882,11 +13882,11 @@ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -13939,11 +13939,11 @@ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -13996,11 +13996,11 @@ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -14053,11 +14053,11 @@ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -14162,11 +14162,11 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -14231,11 +14231,11 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -14300,11 +14300,11 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -14369,11 +14369,11 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -14478,11 +14478,11 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -14547,11 +14547,11 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -14616,11 +14616,11 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -14685,11 +14685,11 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -14756,7 +14756,7 @@ static void wooden_rc_track_booster(
wooden_rc_track_paint<isClassic>(
session, imageIds[direction], railsImageIds[direction], direction, 0, 2, 32, 25, 2, height, 0, 3, height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}

36
src/openrct2/ride/coaster/WoodenWildMouse.cpp
View File

@ -135,7 +135,7 @@ static void wooden_wild_mouse_track_flat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session,
PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C8 | SEGMENT_D4, direction), height,
@ -164,7 +164,7 @@ static void wooden_wild_mouse_track_station(
{ 32, 20, 1 }, { 0, 0, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -197,11 +197,11 @@ static void wooden_wild_mouse_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -244,11 +244,11 @@ static void wooden_wild_mouse_track_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -283,11 +283,11 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -334,11 +334,11 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -384,11 +384,11 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -423,11 +423,11 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -628,11 +628,11 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -678,11 +678,11 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);

8
src/openrct2/ride/gentle/GhostTrain.cpp
View File

@ -185,7 +185,7 @@ static void PaintGhostTrainTrackFlat(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
auto tunnelImage = GetTunnelDoorsImageStraightFlat(trackElement, direction);
paint_util_push_tunnel_rotated(session, direction, height, tunnelImage);
PaintUtilPushTunnelRotated(session, direction, height, tunnelImage);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -386,7 +386,7 @@ static void PaintGhostTrainStation(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPiecesFlat[direction]);
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 0, height });
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
if (direction == 0 || direction == 2)
{
@ -502,7 +502,7 @@ static void PaintGhostTrainTrackSpinningTunnel(
track_paint_util_spinning_tunnel_paint(session, 3, height, direction);
auto tunnelImage = GetTunnelDoorsImageStraightFlat(trackElement, direction);
paint_util_push_tunnel_rotated(session, direction, height, tunnelImage);
PaintUtilPushTunnelRotated(session, direction, height, tunnelImage);
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
@ -520,7 +520,7 @@ static void PaintGhostTrainTrackBrakes(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
auto tunnelImage = GetTunnelDoorsImageStraightFlat(trackElement, direction);
paint_util_push_tunnel_rotated(session, direction, height, tunnelImage);
PaintUtilPushTunnelRotated(session, direction, height, tunnelImage);
if (track_paint_util_should_paint_supports(session.MapPosition))
{

4
src/openrct2/ride/transport/MiniatureRailway.cpp
View File

@ -690,7 +690,7 @@ static void paint_miniature_railway_track_flat(
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -711,7 +711,7 @@ static void paint_miniature_railway_station(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(miniature_railway_track_pieces_flat_station[direction]);
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 2 }, { 0, 0, height });
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
track_paint_util_draw_station_3(session, ride, direction, height + 2, height, trackElement);
// covers shouldn't be offset by +2

28
src/openrct2/ride/transport/SuspendedMonorail.cpp
View File

@ -47,7 +47,7 @@ static void suspended_monorail_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -74,7 +74,7 @@ static void suspended_monorail_track_station(
{ 32, 20, 3 }, { 0, 6, height + 32 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -135,11 +135,11 @@ static void suspended_monorail_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
}
@ -200,11 +200,11 @@ static void suspended_monorail_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20);
}
@ -265,11 +265,11 @@ static void suspended_monorail_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_INVERTED_9);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_15);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_15);
}
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
@ -338,7 +338,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -529,7 +529,7 @@ static void suspended_monorail_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -702,7 +702,7 @@ static void suspended_monorail_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -876,7 +876,7 @@ static void suspended_monorail_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1004,7 +1004,7 @@ static void suspended_monorail_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;
@ -1165,7 +1165,7 @@ static void suspended_monorail_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
break;

70
src/openrct2/ride/water/DingySlide.cpp
View File

@ -379,7 +379,7 @@ static void dinghy_slide_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -411,7 +411,7 @@ static void dinghy_slide_track_station(
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -450,11 +450,11 @@ static void dinghy_slide_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -486,11 +486,11 @@ static void dinghy_slide_track_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -531,11 +531,11 @@ static void dinghy_slide_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -567,11 +567,11 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -603,11 +603,11 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -648,11 +648,11 @@ static void dinghy_slide_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
@ -927,14 +927,14 @@ static void dinghy_slide_track_s_bend_left(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
@ -1030,14 +1030,14 @@ static void dinghy_slide_track_s_bend_right(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
@ -1155,7 +1155,7 @@ static void dinghy_slide_track_flat_covered(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -1186,11 +1186,11 @@ static void dinghy_slide_track_25_deg_up_covered(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -1222,11 +1222,11 @@ static void dinghy_slide_track_60_deg_up_covered(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -1258,11 +1258,11 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -1294,11 +1294,11 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -1330,11 +1330,11 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
@ -1366,11 +1366,11 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
@ -1638,14 +1638,14 @@ static void dinghy_slide_track_s_bend_left_covered(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
@ -1741,14 +1741,14 @@ static void dinghy_slide_track_s_bend_right_covered(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}

48
src/openrct2/ride/water/LogFlume.cpp
View File

@ -175,7 +175,7 @@ static void paint_log_flume_track_flat(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -212,7 +212,7 @@ static void paint_log_flume_track_station(
track_paint_util_draw_station_3(session, ride, direction, height + 2, height, trackElement);
// Covers shouldn't be offset by +2
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -242,11 +242,11 @@ static void paint_log_flume_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -277,11 +277,11 @@ static void paint_log_flume_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -312,11 +312,11 @@ static void paint_log_flume_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -347,11 +347,11 @@ static void paint_log_flume_track_25_deg_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_2);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_1);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -382,11 +382,11 @@ static void paint_log_flume_track_flat_to_25_deg_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_12);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -417,11 +417,11 @@ static void paint_log_flume_track_25_deg_down_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_2);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -519,14 +519,14 @@ static void paint_log_flume_track_s_bend_left(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
@ -622,14 +622,14 @@ static void paint_log_flume_track_s_bend_right(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
}
@ -685,13 +685,13 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(
case 0:
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
break;
case 3:
if (direction == 2 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction ^ 1, height, TUNNEL_0);
}
break;
}
@ -764,13 +764,13 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(
case 0:
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
}
break;
case 3:
if (direction == 0 || direction == 1)
{
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction ^ 1, height, TUNNEL_0);
}
break;
}
@ -819,7 +819,7 @@ static void paint_log_flume_track_on_ride_photo(
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}
@ -843,7 +843,7 @@ static void paint_log_flume_track_reverser(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

56
src/openrct2/ride/water/SplashBoats.cpp
View File

@ -488,11 +488,11 @@ static void paint_splash_boats_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -513,11 +513,11 @@ static void paint_splash_boats_track_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20);
@ -537,11 +537,11 @@ static void paint_splash_boats_track_flat_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -561,11 +561,11 @@ static void paint_splash_boats_track_25_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -586,11 +586,11 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -611,11 +611,11 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -637,11 +637,11 @@ static void paint_splash_boats_track_25_deg_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -670,11 +670,11 @@ static void paint_splash_boats_track_flat_to_25_deg_down(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14);
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_14);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -710,11 +710,11 @@ static void paint_splash_boats_track_25_deg_down_to_flat(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_8);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -792,7 +792,7 @@ static void paint_splash_boats_station(
track_paint_util_draw_narrow_station_platform(session, ride, direction, height, 7, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -863,13 +863,13 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(
case 0:
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
break;
case 6:
if (direction == 2 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction ^ 1, height, TUNNEL_SQUARE_FLAT);
}
break;
}
@ -942,13 +942,13 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(
case 0:
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
break;
case 6:
if (direction == 0 || direction == 1)
{
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction ^ 1, height, TUNNEL_SQUARE_FLAT);
}
break;
}
@ -1042,14 +1042,14 @@ static void paint_splash_boats_track_s_bend_left(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
}
@ -1142,14 +1142,14 @@ static void paint_splash_boats_track_s_bend_right(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
}
@ -1183,7 +1183,7 @@ static void paint_splash_boats_track_on_ride_photo(
paint_splash_boats_track_flat(session, ride, trackSequence, direction, height, trackElement);
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}