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

Name tunnel constants (#11694)

This commit is contained in:
Michael Steenbeek 2020-05-09 23:54:47 +02:00 committed by GitHub
parent 887a86afe9
commit fa91b4091f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 1794 additions and 1792 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,11 +155,11 @@ static void ride_entrance_exit_paint(paint_session* session, uint8_t direction,
if (direction & 1)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
if (!is_exit && !(tile_element->IsGhost()) && tile_element->AsEntrance()->GetRideIndex() != RIDE_ID_NULL

12
src/openrct2/paint/tile_element/Paint.Path.cpp
View File

@ -768,17 +768,17 @@ static void sub_6A3F61(
if (sloped && direction == EDGE_NE)
{
// Path going down into the tunnel
paint_util_push_tunnel_right(session, height + 16, TUNNEL_10);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_PATH_AND_MINI_GOLF);
}
else if (connectedEdges & EDGE_NE)
{
// Flat path with edge to the right (north-east)
paint_util_push_tunnel_right(session, height, TUNNEL_11);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_11);
}
else
{
// Path going up, or flat and not connected to the right
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
}
@ -791,17 +791,17 @@ static void sub_6A3F61(
if (sloped && direction == EDGE_SE)
{
// Path going down into the tunnel
paint_util_push_tunnel_left(session, height + 16, TUNNEL_10);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_PATH_AND_MINI_GOLF);
}
else if (connectedEdges & EDGE_NW)
{
// Flat path with edge to the left (north-west)
paint_util_push_tunnel_left(session, height, TUNNEL_11);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_11);
}
else
{
// Path going up, or flat and not connected to the left
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
}

18
src/openrct2/paint/tile_element/Paint.TileElement.h
View File

@ -45,15 +45,15 @@ enum
TUNNEL_0 = 0,
TUNNEL_1 = 1,
TUNNEL_2 = 2,
TUNNEL_3 = 3,
TUNNEL_4 = 4,
TUNNEL_5 = 5,
TUNNEL_6 = 6,
TUNNEL_7 = 7,
TUNNEL_8 = 8,
TUNNEL_9 = 9,
TUNNEL_10 = 0x0A,
TUNNEL_11 = 0x0B,
TUNNEL_INVERTED_3 = 3,
TUNNEL_INVERTED_4 = 4,
TUNNEL_INVERTED_5 = 5,
TUNNEL_SQUARE_FLAT = 6,
TUNNEL_SQUARE_7 = 7,
TUNNEL_SQUARE_8 = 8,
TUNNEL_SQUARE_INVERTED_9 = 9,
TUNNEL_PATH_AND_MINI_GOLF = 0x0A,
TUNNEL_PATH_11 = 0x0B,
TUNNEL_12 = 0x0C,
TUNNEL_13 = 0x0D,
TUNNEL_14 = 0x0E,

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

@ -193,7 +193,7 @@ static void air_powered_vertical_rc_track_flat(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -223,7 +223,7 @@ static void air_powered_vertical_rc_track_station(
if (ride != nullptr)
track_paint_util_draw_station_platform(session, ride, direction, height, 5, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -267,7 +267,7 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5(
track_paint_util_right_quarter_turn_5_tiles_paint_3(
session, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], imageIds);
track_paint_util_right_quarter_turn_5_tiles_wooden_supports(session, height, direction, trackSequence);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_SQUARE_FLAT);
switch (trackSequence)
{
@ -344,7 +344,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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -373,7 +373,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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -448,7 +448,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(
}
track_paint_util_right_quarter_turn_5_tiles_wooden_supports(session, height, direction, trackSequence);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_SQUARE_FLAT);
switch (trackSequence)
{
@ -526,7 +526,7 @@ static void air_powered_vertical_rc_track_left_bank(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -555,7 +555,7 @@ static void air_powered_vertical_rc_track_brakes(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -667,7 +667,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + supportHeights[trackSequence], 0x20);
@ -693,7 +693,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
if (trackSequence == 0)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -915,13 +915,13 @@ static void air_powered_vertical_rc_track_booster(
{
uint32_t imageId = SPR_REVERSE_FREEFALL_RC_FLAT_NW_SE | colour;
sub_98197C(session, imageId, 0, 0, 20, 32, 1, height, 6, 0, height);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
uint32_t imageId = SPR_REVERSE_FREEFALL_RC_FLAT_SW_NE | colour;
sub_98197C(session, imageId, 0, 0, 32, 20, 1, height, 0, 6, height);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);

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

@ -96,7 +96,7 @@ static void bobsleigh_rc_track_station(
session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -3555,7 +3555,7 @@ static void bobsleigh_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}

358
src/openrct2/ride/coaster/BolligerMabillardTrack.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -69,7 +69,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -95,7 +95,7 @@ static void compact_inverted_rc_track_station(
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, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
}
@ -631,7 +631,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -730,7 +730,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -859,10 +859,10 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -918,7 +918,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -961,7 +961,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -1004,7 +1004,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -1047,7 +1047,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -1091,7 +1091,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -1220,10 +1220,10 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1299,11 +1299,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -1366,11 +1366,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -1433,7 +1433,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -1500,7 +1500,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -1632,7 +1632,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -1750,10 +1750,10 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1797,7 +1797,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -1915,10 +1915,10 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1985,7 +1985,7 @@ static void compact_inverted_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2106,10 +2106,10 @@ static void compact_inverted_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2156,7 +2156,7 @@ static void compact_inverted_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2277,10 +2277,10 @@ static void compact_inverted_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2348,7 +2348,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
break;
@ -2584,10 +2584,10 @@ static void compact_inverted_rc_track_left_vertical_loop(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_INVERTED_4);
break;
case 2:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_INVERTED_4);
break;
}
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -2655,7 +2655,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
break;
@ -2891,10 +2891,10 @@ static void compact_inverted_rc_track_right_vertical_loop(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_INVERTED_4);
break;
case 2:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_INVERTED_4);
break;
}
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -2942,7 +2942,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -3010,10 +3010,10 @@ static void compact_inverted_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -3070,7 +3070,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -3139,10 +3139,10 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -3196,7 +3196,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -3236,10 +3236,10 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -3283,7 +3283,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -3323,10 +3323,10 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -3392,7 +3392,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -3448,10 +3448,10 @@ static void compact_inverted_rc_track_left_twist_down_to_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -3502,7 +3502,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -3558,10 +3558,10 @@ static void compact_inverted_rc_track_right_twist_down_to_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -3605,7 +3605,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session,
@ -3673,10 +3673,10 @@ static void compact_inverted_rc_track_left_twist_up_to_down(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -3715,7 +3715,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session,
@ -3783,10 +3783,10 @@ static void compact_inverted_rc_track_right_twist_up_to_down(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -3850,7 +3850,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
break;
@ -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 + 32, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3997,7 +3997,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
break;
@ -4057,10 +4057,10 @@ static void compact_inverted_rc_track_left_corkscrew_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 40, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 40, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -4115,7 +4115,7 @@ static void compact_inverted_rc_track_right_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
break;
@ -4175,10 +4175,10 @@ static void compact_inverted_rc_track_right_corkscrew_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 40, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 40, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -4245,7 +4245,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(
height + 104);
break;
}
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_4, +56, TUNNEL_5);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_INVERTED_4, +56, TUNNEL_INVERTED_5);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -4286,7 +4286,8 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(
height + 104);
break;
}
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_4, +56, TUNNEL_5);
track_paint_util_right_quarter_turn_1_tile_tunnel(
session, direction, height, -8, TUNNEL_INVERTED_4, +56, TUNNEL_INVERTED_5);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -4338,7 +4339,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -4382,7 +4383,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4516,10 +4517,10 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -4567,7 +4568,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4701,10 +4702,10 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -4752,7 +4753,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4886,10 +4887,10 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -4937,7 +4938,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -5071,10 +5072,10 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -5131,7 +5132,7 @@ static void compact_inverted_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -5276,7 +5277,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_vertical_tunnel(session, height + 56);
paint_util_set_segment_support_height(
@ -5357,10 +5358,10 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height + 48, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 48, TUNNEL_INVERTED_5);
break;
case 2:
paint_util_push_tunnel_left(session, height + 48, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 48, TUNNEL_INVERTED_5);
break;
}
paint_util_set_segment_support_height(
@ -5430,7 +5431,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_5);
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5480,7 +5481,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -5643,7 +5644,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -5824,7 +5825,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -5987,7 +5988,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -8790,7 +8791,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}

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

@ -104,7 +104,7 @@ static void corkscrew_rc_track_station(
session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -4657,7 +4657,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4751,10 +4751,10 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height + 24, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 24, TUNNEL_SQUARE_8);
break;
case 2:
paint_util_push_tunnel_left(session, height + 24, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 24, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -4800,7 +4800,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_7);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4892,10 +4892,10 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(

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

File diff suppressed because it is too large Load Diff

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

@ -90,7 +90,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -123,7 +123,7 @@ static void giga_rc_track_station(
session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -213,11 +213,11 @@ static void giga_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -283,11 +283,11 @@ static void giga_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -379,11 +379,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -457,11 +457,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -535,11 +535,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -631,7 +631,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -720,7 +720,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -841,10 +841,10 @@ static void giga_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -895,7 +895,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -933,7 +933,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -971,7 +971,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1009,7 +1009,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1049,7 +1049,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1176,10 +1176,10 @@ static void giga_rc_track_banked_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1232,11 +1232,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1277,11 +1277,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1322,7 +1322,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1367,7 +1367,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1438,7 +1438,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1482,7 +1482,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1603,10 +1603,10 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -1646,7 +1646,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1767,10 +1767,10 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -1828,7 +1828,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1920,10 +1920,10 @@ static void giga_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1963,7 +1963,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2055,10 +2055,10 @@ static void giga_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2098,7 +2098,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2158,10 +2158,10 @@ static void giga_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2214,7 +2214,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2279,10 +2279,10 @@ static void giga_rc_track_left_quarter_turn_3_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2331,7 +2331,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2367,10 +2367,10 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -2410,7 +2410,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2453,10 +2453,10 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -2518,7 +2518,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2584,10 +2584,10 @@ static void giga_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2623,10 +2623,10 @@ static void giga_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2692,7 +2692,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2736,7 +2736,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2802,10 +2802,10 @@ static void giga_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2841,10 +2841,10 @@ static void giga_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2910,7 +2910,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2982,7 +2982,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3110,10 +3110,10 @@ static void giga_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3149,10 +3149,10 @@ static void giga_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3280,7 +3280,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3324,7 +3324,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3459,10 +3459,10 @@ static void giga_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3498,10 +3498,10 @@ static void giga_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3636,7 +3636,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3706,7 +3706,7 @@ static void giga_rc_track_left_quarter_turn_1_60_deg_up(
session, direction, session->TrackColours[SCHEME_TRACK] | 18234, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_7, +56, TUNNEL_8);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_SQUARE_7, +56, TUNNEL_SQUARE_8);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -3743,7 +3743,7 @@ static void giga_rc_track_right_quarter_turn_1_60_deg_up(
session, direction, session->TrackColours[SCHEME_TRACK] | 18229, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_7, +56, TUNNEL_8);
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_SQUARE_7, +56, TUNNEL_SQUARE_8);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -3790,7 +3790,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -3826,11 +3826,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3867,11 +3867,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3915,7 +3915,7 @@ static void giga_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -4008,7 +4008,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4214,10 +4214,10 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height + 24, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 24, TUNNEL_SQUARE_8);
break;
case 2:
paint_util_push_tunnel_left(session, height + 24, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 24, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -4263,7 +4263,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_7);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4355,10 +4355,10 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -4418,11 +4418,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4455,11 +4455,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4498,11 +4498,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4537,11 +4537,11 @@ static void giga_rc_track_cable_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4580,7 +4580,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4719,7 +4719,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4877,7 +4877,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -5019,7 +5019,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7745,7 +7745,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -7782,7 +7782,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7820,10 +7820,10 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -7864,7 +7864,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7909,10 +7909,10 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -7973,7 +7973,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8099,10 +8099,10 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -8143,7 +8143,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8269,10 +8269,10 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -8334,11 +8334,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8377,11 +8377,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8420,11 +8420,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8463,11 +8463,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8540,11 +8540,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8581,11 +8581,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8622,7 +8622,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8663,7 +8663,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8742,11 +8742,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8785,11 +8785,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8828,7 +8828,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8871,7 +8871,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8943,7 +8943,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);

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

@ -103,7 +103,7 @@ static void heartline_twister_rc_track_station(
session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

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

@ -103,7 +103,7 @@ static void inverted_hairpin_rc_track_station(
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, rideIndex, direction, height, tileElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

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

@ -48,7 +48,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -74,7 +74,7 @@ static void inverted_impulse_rc_track_station(
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, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -394,7 +394,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -535,7 +535,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_vertical_tunnel(session, height + 56);
paint_util_set_segment_support_height(
@ -587,10 +587,10 @@ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height + 48, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 48, TUNNEL_INVERTED_5);
break;
case 2:
paint_util_push_tunnel_left(session, height + 48, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 48, TUNNEL_INVERTED_5);
break;
}
paint_util_set_segment_support_height(
@ -631,7 +631,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_5);
paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

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

@ -68,7 +68,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -94,7 +94,7 @@ static void inverted_rc_track_station(
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, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
}
@ -531,7 +531,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -757,10 +757,10 @@ static void inverted_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -815,7 +815,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -857,7 +857,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -899,7 +899,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -941,7 +941,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -985,7 +985,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -1114,10 +1114,10 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1192,11 +1192,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -1259,11 +1259,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -1326,7 +1326,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -1393,7 +1393,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -1472,7 +1472,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -1520,7 +1520,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -1638,10 +1638,10 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1685,7 +1685,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -1803,10 +1803,10 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1873,7 +1873,7 @@ static void inverted_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -1994,10 +1994,10 @@ static void inverted_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2044,7 +2044,7 @@ static void inverted_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2165,10 +2165,10 @@ static void inverted_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2236,7 +2236,7 @@ static void inverted_rc_track_left_vertical_loop(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
break;
@ -2472,10 +2472,10 @@ static void inverted_rc_track_left_vertical_loop(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_INVERTED_4);
break;
case 2:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_INVERTED_4);
break;
}
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -2543,7 +2543,7 @@ static void inverted_rc_track_right_vertical_loop(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
break;
@ -2779,10 +2779,10 @@ static void inverted_rc_track_right_vertical_loop(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_INVERTED_4);
break;
case 2:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_4);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_INVERTED_4);
break;
}
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -2830,7 +2830,7 @@ static void inverted_rc_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2898,10 +2898,10 @@ static void inverted_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2958,7 +2958,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -3027,10 +3027,10 @@ static void inverted_rc_track_left_quarter_turn_3_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -3083,7 +3083,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -3123,10 +3123,10 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -3170,7 +3170,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -3210,10 +3210,10 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -3279,7 +3279,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -3334,10 +3334,10 @@ static void inverted_rc_track_left_twist_down_to_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -3388,7 +3388,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -3443,10 +3443,10 @@ static void inverted_rc_track_right_twist_down_to_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -3489,7 +3489,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session,
@ -3557,10 +3557,10 @@ static void inverted_rc_track_left_twist_up_to_down(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -3598,7 +3598,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session,
@ -3666,10 +3666,10 @@ static void inverted_rc_track_right_twist_up_to_down(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -3733,7 +3733,7 @@ static void inverted_rc_track_half_loop_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
break;
@ -3821,7 +3821,7 @@ static void inverted_rc_track_half_loop_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3880,7 +3880,7 @@ static void inverted_rc_track_left_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
break;
@ -3940,10 +3940,10 @@ static void inverted_rc_track_left_corkscrew_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 40, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 40, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -3998,7 +3998,7 @@ static void inverted_rc_track_right_corkscrew_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
break;
@ -4058,10 +4058,10 @@ static void inverted_rc_track_right_corkscrew_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 40, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height + 40, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 40, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -4122,7 +4122,7 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_up(
session, direction, session->TrackColours[SCHEME_TRACK] | 27347, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_4, +56, TUNNEL_5);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_INVERTED_4, +56, TUNNEL_INVERTED_5);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -4159,7 +4159,8 @@ static void inverted_rc_track_right_quarter_turn_1_60_deg_up(
session, direction, session->TrackColours[SCHEME_TRACK] | 27342, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_4, +56, TUNNEL_5);
track_paint_util_right_quarter_turn_1_tile_tunnel(
session, direction, height, -8, TUNNEL_INVERTED_4, +56, TUNNEL_INVERTED_5);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -4210,7 +4211,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -4254,7 +4255,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4388,10 +4389,10 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -4439,7 +4440,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4573,10 +4574,10 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -4624,7 +4625,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4758,10 +4759,10 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -4809,7 +4810,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4943,10 +4944,10 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -5010,11 +5011,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
}
@ -5075,11 +5076,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
}
@ -5125,7 +5126,7 @@ static void inverted_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -5185,7 +5186,7 @@ static void inverted_rc_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -5348,7 +5349,7 @@ static void inverted_rc_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -5529,7 +5530,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -5692,7 +5693,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -8497,7 +8498,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8681,7 +8682,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session,
@ -8726,7 +8727,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8910,7 +8911,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session,
@ -8966,7 +8967,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -9006,7 +9007,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -9046,10 +9047,10 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -9093,7 +9094,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -9133,10 +9134,10 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -9200,7 +9201,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -9318,10 +9319,10 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -9365,7 +9366,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -9483,10 +9484,10 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -9570,11 +9571,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
}
@ -9635,11 +9636,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
}
@ -9700,11 +9701,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
}
@ -9765,11 +9766,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
}
@ -9866,11 +9867,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -9931,11 +9932,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -9996,7 +9997,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -10061,7 +10062,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -10162,11 +10163,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -10227,11 +10228,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -10292,7 +10293,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -10357,7 +10358,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{

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

@ -1668,7 +1668,7 @@ void junior_rc_paint_station(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
{
@ -1689,7 +1689,7 @@ void junior_rc_paint_station(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
@ -5701,7 +5701,7 @@ static void junior_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3 + photoCameraOffset, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48 + photoCameraOffset, 0x20);
}

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

@ -156,7 +156,7 @@ static void lay_down_rc_track_station(
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, rideIndex, direction, height, tileElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
else
{
@ -183,7 +183,7 @@ static void lay_down_rc_track_station(
session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -15154,7 +15154,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -15288,10 +15288,10 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -15338,7 +15338,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -15472,10 +15472,10 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -15522,7 +15522,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -15656,10 +15656,10 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -15706,7 +15706,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -15840,10 +15840,10 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);

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

@ -47,7 +47,7 @@ static void lim_launched_rc_track_station(
session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -655,10 +655,10 @@ static void lim_launched_rc_track_left_twist_down_to_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height - 32, TUNNEL_3);
paint_util_push_tunnel_right(session, height - 32, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height - 32, TUNNEL_3);
paint_util_push_tunnel_left(session, height - 32, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -792,10 +792,10 @@ static void lim_launched_rc_track_right_twist_down_to_up(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height + 32, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 32, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height + 32, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 32, TUNNEL_INVERTED_3);
break;
}
paint_util_set_segment_support_height(
@ -847,7 +847,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_3);
paint_util_push_tunnel_rotated(session, direction, height - 32, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -984,7 +984,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_INVERTED_3);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),

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

@ -100,7 +100,7 @@ static void looping_rc_track_station(
session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

130
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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -71,7 +71,7 @@ static void mine_ride_track_station(
session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -122,11 +122,11 @@ static void mine_ride_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -179,11 +179,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -236,7 +236,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -308,7 +308,7 @@ static void mine_ride_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -436,10 +436,10 @@ static void mine_ride_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -506,7 +506,7 @@ static void mine_ride_track_flat_to_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -560,7 +560,7 @@ static void mine_ride_track_flat_to_right_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -614,7 +614,7 @@ static void mine_ride_track_left_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -668,7 +668,7 @@ static void mine_ride_track_right_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -715,7 +715,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -849,10 +849,10 @@ static void mine_ride_track_banked_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -921,11 +921,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -982,11 +982,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1043,7 +1043,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1104,7 +1104,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1191,7 +1191,7 @@ static void mine_ride_track_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1242,7 +1242,7 @@ static void mine_ride_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1341,10 +1341,10 @@ static void mine_ride_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1391,7 +1391,7 @@ static void mine_ride_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1490,10 +1490,10 @@ static void mine_ride_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1540,7 +1540,7 @@ static void mine_ride_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1607,10 +1607,10 @@ static void mine_ride_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1670,7 +1670,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1742,10 +1742,10 @@ static void mine_ride_track_left_quarter_turn_3_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1805,7 +1805,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -1878,10 +1878,10 @@ static void mine_ride_track_left_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1924,10 +1924,10 @@ static void mine_ride_track_left_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2000,7 +2000,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2051,7 +2051,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2124,10 +2124,10 @@ static void mine_ride_track_right_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2170,10 +2170,10 @@ static void mine_ride_track_right_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2246,7 +2246,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2327,7 +2327,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2462,10 +2462,10 @@ static void mine_ride_track_left_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2508,10 +2508,10 @@ static void mine_ride_track_left_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2646,7 +2646,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2697,7 +2697,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -2832,10 +2832,10 @@ static void mine_ride_track_right_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2878,10 +2878,10 @@ static void mine_ride_track_right_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3016,7 +3016,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3097,7 +3097,7 @@ static void mine_ride_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -3139,7 +3139,7 @@ static void mine_ride_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3285,7 +3285,7 @@ static void mine_ride_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3450,7 +3450,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3599,7 +3599,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

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

@ -68,7 +68,7 @@ static void mine_train_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -102,7 +102,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, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -166,11 +166,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -206,11 +206,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
@ -275,11 +275,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -319,11 +319,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -363,11 +363,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -432,7 +432,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -523,7 +523,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -666,10 +666,10 @@ static void mine_train_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -719,7 +719,7 @@ static void mine_train_rc_track_flat_to_left_bank(
wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -756,7 +756,7 @@ static void mine_train_rc_track_flat_to_right_bank(
wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -793,7 +793,7 @@ static void mine_train_rc_track_left_bank_to_flat(
wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -830,7 +830,7 @@ static void mine_train_rc_track_right_bank_to_flat(
wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -872,7 +872,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1021,10 +1021,10 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1076,11 +1076,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1120,11 +1120,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1164,7 +1164,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1208,7 +1208,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1278,7 +1278,7 @@ static void mine_train_rc_track_left_bank(
wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -1324,7 +1324,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -1467,10 +1467,10 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1512,7 +1512,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -1655,10 +1655,10 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1720,7 +1720,7 @@ static void mine_train_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1814,10 +1814,10 @@ static void mine_train_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1859,7 +1859,7 @@ static void mine_train_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1953,10 +1953,10 @@ static void mine_train_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1998,7 +1998,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -2075,10 +2075,10 @@ static void mine_train_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -2133,7 +2133,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -2215,10 +2215,10 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -2269,7 +2269,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -2324,10 +2324,10 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -2369,7 +2369,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -2424,10 +2424,10 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -2493,7 +2493,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -2579,10 +2579,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2623,10 +2623,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2712,7 +2712,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -2761,7 +2761,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -2847,10 +2847,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2891,10 +2891,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2980,7 +2980,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -3059,7 +3059,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -3216,10 +3216,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3260,10 +3260,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3420,7 +3420,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -3469,7 +3469,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -3620,10 +3620,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3664,10 +3664,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3818,7 +3818,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -3880,7 +3880,7 @@ static void mine_train_rc_track_brakes(
wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -3914,7 +3914,7 @@ static void mine_train_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 2, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -3952,7 +3952,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -4097,7 +4097,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -4261,7 +4261,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -4409,7 +4409,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -7294,7 +7294,7 @@ static void mine_train_rc_track_block_brakes(
wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

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

@ -92,7 +92,7 @@ static void mini_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -125,7 +125,7 @@ static void mini_rc_track_station(
session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -221,11 +221,11 @@ static void mini_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -278,11 +278,11 @@ static void mini_rc_track_60_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -380,11 +380,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -441,11 +441,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -502,11 +502,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -604,7 +604,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -700,7 +700,7 @@ static void mini_rc_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -828,10 +828,10 @@ static void mini_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -898,7 +898,7 @@ static void mini_rc_track_flat_to_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -952,7 +952,7 @@ static void mini_rc_track_flat_to_right_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1006,7 +1006,7 @@ static void mini_rc_track_left_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1060,7 +1060,7 @@ static void mini_rc_track_right_bank_to_flat(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1107,7 +1107,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1241,10 +1241,10 @@ static void mini_rc_track_banked_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -1313,11 +1313,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1374,11 +1374,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1435,7 +1435,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1496,7 +1496,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1583,7 +1583,7 @@ static void mini_rc_track_left_bank(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1634,7 +1634,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1762,10 +1762,10 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -1812,7 +1812,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1940,10 +1940,10 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -2008,7 +2008,7 @@ static void mini_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2107,10 +2107,10 @@ static void mini_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2157,7 +2157,7 @@ static void mini_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2256,10 +2256,10 @@ static void mini_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2306,7 +2306,7 @@ static void mini_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2373,10 +2373,10 @@ static void mini_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2436,7 +2436,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2508,10 +2508,10 @@ static void mini_rc_track_left_quarter_turn_3_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2567,7 +2567,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2610,10 +2610,10 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -2660,7 +2660,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2703,10 +2703,10 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -2775,7 +2775,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -2848,10 +2848,10 @@ static void mini_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2894,10 +2894,10 @@ static void mini_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -2970,7 +2970,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3021,7 +3021,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3094,10 +3094,10 @@ static void mini_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3140,10 +3140,10 @@ static void mini_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3216,7 +3216,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3295,7 +3295,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -3430,10 +3430,10 @@ static void mini_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3476,10 +3476,10 @@ static void mini_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3614,7 +3614,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3665,7 +3665,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
@ -3800,10 +3800,10 @@ static void mini_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3846,10 +3846,10 @@ static void mini_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -3984,7 +3984,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
@ -4054,7 +4054,7 @@ static void mini_rc_track_left_quarter_turn_1_60_deg_up(
session, direction, session->TrackColours[SCHEME_TRACK] | 18896, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_7, +56, TUNNEL_8);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_SQUARE_7, +56, TUNNEL_SQUARE_8);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -4091,7 +4091,7 @@ static void mini_rc_track_right_quarter_turn_1_60_deg_up(
session, direction, session->TrackColours[SCHEME_TRACK] | 18891, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_7, +56, TUNNEL_8);
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_SQUARE_7, +56, TUNNEL_SQUARE_8);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -4140,7 +4140,7 @@ static void mini_rc_track_brakes(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -4192,11 +4192,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4249,11 +4249,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4301,7 +4301,7 @@ static void mini_rc_track_on_ride_photo(
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -4359,7 +4359,7 @@ static void mini_rc_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4505,7 +4505,7 @@ static void mini_rc_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4670,7 +4670,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -4819,7 +4819,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7547,7 +7547,7 @@ static void mini_rc_track_block_brakes(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -7591,7 +7591,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7636,10 +7636,10 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -7687,7 +7687,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7732,10 +7732,10 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -7803,7 +7803,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7936,10 +7936,10 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -7987,7 +7987,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8120,10 +8120,10 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -8201,11 +8201,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8260,11 +8260,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8319,11 +8319,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8378,11 +8378,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8471,11 +8471,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8528,11 +8528,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8585,7 +8585,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8642,7 +8642,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8737,11 +8737,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8796,11 +8796,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -8855,7 +8855,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8914,7 +8914,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -8993,7 +8993,7 @@ static void mini_rc_track_left_curved_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9036,10 +9036,10 @@ static void mini_rc_track_left_curved_lift_hill(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -9085,7 +9085,7 @@ static void mini_rc_track_right_curved_lift_hill(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -9128,10 +9128,10 @@ static void mini_rc_track_right_curved_lift_hill(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(
@ -9176,7 +9176,7 @@ static void mini_rc_track_booster(
}
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);

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

@ -101,7 +101,7 @@ static void mini_suspended_rc_track_station(
height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

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

File diff suppressed because it is too large Load Diff

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

@ -201,13 +201,13 @@ static void paint_reverse_freefall_rc_flat(
{
uint32_t imageId = SPR_REVERSE_FREEFALL_RC_FLAT_NW_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 20, 32, 1, height, 6, 0, height);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
uint32_t imageId = SPR_REVERSE_FREEFALL_RC_FLAT_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 20, 1, height, 0, 6, height);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@ -233,7 +233,7 @@ static void paint_reverse_freefall_rc_station(
wooden_a_supports_paint_setup(
session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
{
@ -247,7 +247,7 @@ static void paint_reverse_freefall_rc_station(
wooden_a_supports_paint_setup(
session, (direction & 1) ? 1 : 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
auto ride = get_ride(rideIndex);
@ -291,11 +291,11 @@ static void paint_reverse_freefall_rc_slope(
int32_t tunnelOffset = tunnelOffsets03[trackSequence];
if (direction & 1)
{
paint_util_push_tunnel_right(session, height + tunnelOffset, TUNNEL_6);
paint_util_push_tunnel_right(session, height + tunnelOffset, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_left(session, height + tunnelOffset, TUNNEL_6);
paint_util_push_tunnel_left(session, height + tunnelOffset, TUNNEL_SQUARE_FLAT);
}
}
else

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

@ -81,7 +81,7 @@ static void reverser_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -104,7 +104,7 @@ static void reverser_rc_track_station(
height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -168,11 +168,11 @@ static void reverser_rc_track_25_deg_up(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -237,11 +237,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -306,7 +306,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -373,7 +373,7 @@ static void reverser_rc_track_left_quarter_turn_5(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -509,10 +509,10 @@ static void reverser_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -563,7 +563,7 @@ static void reverser_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -657,10 +657,10 @@ static void reverser_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -702,7 +702,7 @@ static void reverser_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -796,10 +796,10 @@ static void reverser_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -841,7 +841,7 @@ static void reverser_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -903,10 +903,10 @@ static void reverser_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -944,7 +944,7 @@ static void reverser_rc_track_brakes(
wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -982,7 +982,7 @@ static void reverser_rc_track_left_reverser(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1122,10 +1122,10 @@ static void reverser_rc_track_left_reverser(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1167,7 +1167,7 @@ static void reverser_rc_track_right_reverser(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1307,10 +1307,10 @@ static void reverser_rc_track_right_reverser(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);

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

@ -133,7 +133,7 @@ static void side_friction_rc_track_flat(
break;
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -154,7 +154,7 @@ static void side_friction_rc_track_station(
session, direction, imageIds[direction] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 27, 2, height, 0, 2, height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -234,11 +234,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -319,11 +319,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -404,7 +404,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -483,7 +483,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -667,10 +667,10 @@ static void side_friction_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -733,7 +733,7 @@ static void side_friction_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -863,10 +863,10 @@ static void side_friction_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -920,7 +920,7 @@ static void side_friction_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1050,10 +1050,10 @@ static void side_friction_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1107,7 +1107,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1193,10 +1193,10 @@ static void side_friction_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1238,7 +1238,7 @@ static void side_friction_rc_track_brakes(
wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -1288,7 +1288,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -1481,7 +1481,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -2916,11 +2916,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
@ -2979,11 +2979,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -3042,11 +3042,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);

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

@ -98,7 +98,7 @@ static void stand_up_rc_track_station(
session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

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

@ -85,7 +85,7 @@ static void steeplechase_track_station(
height);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

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

@ -68,7 +68,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -94,7 +94,7 @@ static void suspended_swinging_rc_track_station(
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, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_INVERTED_5);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
}
@ -566,7 +566,7 @@ 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_3);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_3);
}
else
{
@ -665,7 +665,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -794,10 +794,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -851,7 +851,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -970,10 +970,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1017,7 +1017,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -1136,10 +1136,10 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1202,7 +1202,7 @@ static void suspended_swinging_rc_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -1315,10 +1315,10 @@ static void suspended_swinging_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1361,7 +1361,7 @@ static void suspended_swinging_rc_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -1474,10 +1474,10 @@ static void suspended_swinging_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1525,7 +1525,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -1593,10 +1593,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1650,7 +1650,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -1690,10 +1690,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1737,7 +1737,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_4);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_INVERTED_4);
}
paint_util_set_general_support_height(session, height + 88, 0x20);
break;
@ -1777,10 +1777,10 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_INVERTED_5);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_5);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_INVERTED_5);
break;
}
paint_util_set_general_support_height(session, height + 88, 0x20);
@ -1836,7 +1836,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -1880,7 +1880,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2014,10 +2014,10 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2065,7 +2065,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2199,10 +2199,10 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_right(session, height + 16, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height + 16, TUNNEL_3);
paint_util_push_tunnel_left(session, height + 16, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2250,7 +2250,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2384,10 +2384,10 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2435,7 +2435,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_3);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2569,10 +2569,10 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_3);
paint_util_push_tunnel_right(session, height, TUNNEL_INVERTED_3);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_3);
paint_util_push_tunnel_left(session, height, TUNNEL_INVERTED_3);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -2619,7 +2619,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -2782,7 +2782,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -4401,7 +4401,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_3);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_INVERTED_3);
paint_util_set_general_support_height(session, height + 48, 0x20);
}

38
src/openrct2/ride/coaster/VirginiaReel.cpp
View File

@ -221,12 +221,12 @@ static void paint_virginia_reel_track_flat(
if (direction & 1)
{
sub_98197C(session, imageId, 0, 0, 27, 32, 2, height, 2, 0, height);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
sub_98197C(session, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@ -267,19 +267,19 @@ static void paint_virginia_reel_track_25_deg_up(
{
case 0:
wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -306,27 +306,27 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(
sub_98197C(session, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
ps = sub_98197C(session, imageId, 0, 0, 27, 32, 2, height, 2, 0, height);
session->WoodenSupportsPrependTo = ps;
wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 2:
ps = sub_98197C(session, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
session->WoodenSupportsPrependTo = ps;
wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
case 3:
sub_98197C(session, imageId, 0, 0, 27, 32, 2, height, 2, 0, height);
wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -366,7 +366,7 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(
{
case 0:
wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@ -378,7 +378,7 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -425,7 +425,7 @@ static void paint_virginia_reel_station(
imageId = SPR_VIRGINIA_REEL_FLAT_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98199C(session, imageId, 0, 0, 32, 20, 2, height, 0, 0, height);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
{
@ -435,7 +435,7 @@ static void paint_virginia_reel_station(
imageId = SPR_VIRGINIA_REEL_FLAT_NW_SE | session->TrackColours[SCHEME_TRACK];
sub_98199C(session, imageId, 0, 0, 20, 32, 2, height, 0, 0, height);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@ -455,7 +455,7 @@ static void paint_virginia_reel_track_left_quarter_turn_3_tiles(
track_paint_util_left_quarter_turn_3_tiles_paint(
session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
virginia_reel_track_pieces_flat_quarter_turn_3_tiles);
track_paint_util_left_quarter_turn_3_tiles_tunnel(session, height, TUNNEL_6, direction, trackSequence);
track_paint_util_left_quarter_turn_3_tiles_tunnel(session, height, TUNNEL_SQUARE_FLAT, direction, trackSequence);
switch (trackSequence)
{
@ -500,19 +500,19 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile(
{
case 0:
wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
break;
case 2:
wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}

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

@ -216,7 +216,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, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

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

@ -456,7 +456,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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -487,7 +487,7 @@ static void wooden_rc_track_station(
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -531,11 +531,11 @@ static void wooden_rc_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -569,11 +569,11 @@ static void wooden_rc_track_60_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -619,11 +619,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -661,11 +661,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -703,11 +703,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -753,7 +753,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1019,7 +1019,7 @@ static void wooden_rc_track_right_quarter_turn_5(
wooden_rc_track_paint_bb(session, &imageIds[0][direction][trackSequence], height);
wooden_rc_track_paint_bb(session, &imageIds[1][direction][trackSequence], height);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_SQUARE_FLAT);
if (supportType[direction][trackSequence] != -1)
{
@ -1088,7 +1088,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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -1115,7 +1115,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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -1343,7 +1343,7 @@ static void wooden_rc_track_banked_right_quarter_turn_5(
wooden_rc_track_paint_bb(session, &imageIds[0][direction][trackSequence], height);
wooden_rc_track_paint_bb(session, &imageIds[1][direction][trackSequence], height);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
track_paint_util_right_quarter_turn_5_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_SQUARE_FLAT);
if (supportType[direction][trackSequence] != -1)
{
@ -1415,11 +1415,11 @@ static void wooden_rc_track_left_bank_to_25_deg_up(
session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1450,11 +1450,11 @@ static void wooden_rc_track_right_bank_to_25_deg_up(
session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -1485,7 +1485,7 @@ static void wooden_rc_track_25_deg_up_to_left_bank(
session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1520,7 +1520,7 @@ static void wooden_rc_track_25_deg_up_to_right_bank(
session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -1577,7 +1577,7 @@ static void wooden_rc_track_left_bank(
wooden_rc_track_paint(
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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -1637,7 +1637,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -1879,10 +1879,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1938,7 +1938,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -2180,10 +2180,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -2263,7 +2263,7 @@ static void wooden_rc_track_s_bend_left(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -2417,10 +2417,10 @@ static void wooden_rc_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -2482,7 +2482,7 @@ static void wooden_rc_track_s_bend_right(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -2636,10 +2636,10 @@ static void wooden_rc_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -2678,7 +2678,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(
session,
@ -2889,10 +2889,10 @@ static void wooden_rc_track_left_vertical_loop(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
case 2:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
}
paint_util_set_segment_support_height(
@ -2935,7 +2935,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_general_support_height(session, height + 56, 0x20);
break;
@ -3117,10 +3117,10 @@ static void wooden_rc_track_right_vertical_loop(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
case 2:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
}
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -3183,7 +3183,7 @@ static void wooden_rc_track_left_quarter_turn_3(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -3288,10 +3288,10 @@ static void wooden_rc_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -3362,7 +3362,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -3467,10 +3467,10 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -3541,7 +3541,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -3607,10 +3607,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -3672,7 +3672,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -3738,10 +3738,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -3821,7 +3821,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -3945,10 +3945,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -4005,10 +4005,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -4132,7 +4132,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -4197,7 +4197,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -4321,10 +4321,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -4381,10 +4381,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -4508,7 +4508,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -4603,7 +4603,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -4835,10 +4835,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -4895,10 +4895,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -5130,7 +5130,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -5195,7 +5195,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
@ -5427,10 +5427,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -5487,10 +5487,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(
@ -5722,7 +5722,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_6);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
@ -5812,7 +5812,7 @@ static void wooden_rc_track_left_quarter_turn_1_60_deg_up(
session, direction, wooden_rc_get_rails_colour(session) | 25086, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_7, +56, TUNNEL_8);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_SQUARE_7, +56, TUNNEL_SQUARE_8);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -5865,7 +5865,7 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_up(
session, direction, wooden_rc_get_rails_colour(session) | 25090, 0, 0, 28, 28, 1, height, 2, 2, height + 99);
break;
}
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_7, +56, TUNNEL_8);
track_paint_util_right_quarter_turn_1_tile_tunnel(session, direction, height, -8, TUNNEL_SQUARE_7, +56, TUNNEL_SQUARE_8);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
}
@ -5901,7 +5901,7 @@ static void wooden_rc_track_brakes(
wooden_rc_track_paint(
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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -5952,11 +5952,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -6008,11 +6008,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -6052,7 +6052,7 @@ static void wooden_rc_track_on_ride_photo(
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
track_paint_util_onride_photo_small_paint(session, direction, height + 16, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -6157,7 +6157,7 @@ static void wooden_rc_track_water_splash(
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -6444,7 +6444,7 @@ static void wooden_rc_track_water_splash(
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -6504,7 +6504,7 @@ static void wooden_rc_track_left_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -6737,7 +6737,7 @@ static void wooden_rc_track_right_eighth_to_diag(
}
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -6986,7 +6986,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -7219,7 +7219,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -10971,7 +10971,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 64, 0x20);
@ -11037,10 +11037,10 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -11102,7 +11102,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 64, 0x20);
@ -11168,10 +11168,10 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -11239,7 +11239,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_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 64, 0x20);
@ -11299,10 +11299,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -11370,7 +11370,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_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 64, 0x20);
@ -11430,10 +11430,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -11451,7 +11451,7 @@ static void wooden_rc_track_block_brakes(
session, _wooden_rc_block_brakes_image_ids[direction][0], _wooden_rc_block_brakes_image_ids[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], nullptr);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -11509,7 +11509,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -11575,10 +11575,10 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -11640,7 +11640,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -11706,10 +11706,10 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -11785,7 +11785,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -12027,10 +12027,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -12086,7 +12086,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -12328,10 +12328,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 1:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -12398,11 +12398,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -12446,11 +12446,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -12494,11 +12494,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -12542,11 +12542,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -12634,11 +12634,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -12690,11 +12690,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -12746,7 +12746,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -12802,7 +12802,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -12894,11 +12894,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -12950,11 +12950,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -13006,7 +13006,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -13062,7 +13062,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{

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

@ -165,7 +165,7 @@ static void wooden_wild_mouse_track_station(
height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
}

4
src/openrct2/ride/gentle/CarRide.cpp
View File

@ -342,11 +342,11 @@ static void paint_car_ride_station(
if (direction == 0 || direction == 2)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 0 || direction == 2)

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

@ -393,11 +393,11 @@ static void paint_ghost_train_station(
if (direction == 0 || direction == 2)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 0 || direction == 2)

40
src/openrct2/ride/gentle/MiniGolf.cpp
View File

@ -491,13 +491,13 @@ static void paint_mini_golf_track_flat(
{
imageId = SPR_MINI_GOLF_FLAT_NW_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 20, 32, 1, height, 6, 0, height);
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
else
{
imageId = SPR_MINI_GOLF_FLAT_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 20, 1, height, 0, 6, height);
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@ -589,7 +589,7 @@ static void paint_mini_golf_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
break;
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_2);
@ -598,7 +598,7 @@ static void paint_mini_golf_track_flat_to_25_deg_up(
paint_util_push_tunnel_left(session, height, TUNNEL_2);
break;
case 3:
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
break;
}
@ -631,10 +631,10 @@ static void paint_mini_golf_track_25_deg_up_to_flat(
paint_util_push_tunnel_left(session, height - 8, TUNNEL_0);
break;
case 1:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_10);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_PATH_AND_MINI_GOLF);
break;
case 2:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_10);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_PATH_AND_MINI_GOLF);
break;
case 3:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_0);
@ -705,7 +705,7 @@ static void paint_mini_golf_station(
track_paint_util_draw_station_covers(session, EDGE_SW, hasSWFence, stationObj, height);
// Was leftwards tunnel in game, seems odd
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
@ -727,7 +727,7 @@ static void paint_mini_golf_station(
track_paint_util_draw_station_covers(session, EDGE_NW, hasFence, stationObj, height);
track_paint_util_draw_station_covers(session, EDGE_SE, hasSEFence, stationObj, height);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@ -756,7 +756,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
if (!shouldDrawFence)
break;
@ -774,7 +774,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(
break;
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
if (!shouldDrawFence)
break;
@ -783,8 +783,8 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
if (!shouldDrawFence)
break;
@ -838,11 +838,11 @@ static void paint_mini_golf_hole_ab(
if ((direction == 0 && trackSequence == 0) || (direction == 2 && trackSequence == 1))
{
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
else if ((direction == 3 && trackSequence == 0) || (direction == 1 && trackSequence == 1))
{
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
if (direction & 1)
@ -906,11 +906,11 @@ static void paint_mini_golf_hole_c(
if ((direction == 0 && trackSequence == 0) || (direction == 2 && trackSequence == 1))
{
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
else if ((direction == 3 && trackSequence == 0) || (direction == 1 && trackSequence == 1))
{
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
if (direction & 1)
@ -978,12 +978,12 @@ static void paint_mini_golf_hole_d(
{
case 0x00:
case 0x12:
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
break;
case 0x02:
case 0x30:
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
break;
}
@ -1068,12 +1068,12 @@ static void paint_mini_golf_hole_e(
{
case 0x00:
case 0x12:
paint_util_push_tunnel_left(session, height, TUNNEL_10);
paint_util_push_tunnel_left(session, height, TUNNEL_PATH_AND_MINI_GOLF);
break;
case 0x02:
case 0x30:
paint_util_push_tunnel_right(session, height, TUNNEL_10);
paint_util_push_tunnel_right(session, height, TUNNEL_PATH_AND_MINI_GOLF);
break;
}

4
src/openrct2/ride/gentle/MiniHelicopters.cpp
View File

@ -33,7 +33,7 @@ static void paint_mini_helicopters_track_station(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
{
@ -45,7 +45,7 @@ static void paint_mini_helicopters_track_station(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);

4
src/openrct2/ride/gentle/MonorailCycles.cpp
View File

@ -206,7 +206,7 @@ static void paint_monorail_cycles_station(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
{
@ -218,7 +218,7 @@ static void paint_monorail_cycles_station(
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);

36
src/openrct2/ride/thrill/GoKarts.cpp
View File

@ -137,7 +137,7 @@ static void paint_go_karts_track_flat(
imageId = SPR_GO_KARTS_FLAT_FRONT_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 1, 3, height, 0, 29, height + 2);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
@ -147,7 +147,7 @@ static void paint_go_karts_track_flat(
imageId = SPR_GO_KARTS_FLAT_FRONT_NW_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 1, 32, 3, height, 29, 0, height + 2);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@ -190,19 +190,19 @@ static void paint_go_karts_track_25_deg_up(
{
case 0:
wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -244,19 +244,19 @@ static void paint_go_karts_track_flat_to_25_deg_up(
{
case 0:
wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -298,7 +298,7 @@ static void paint_go_karts_track_25_deg_up_to_flat(
{
case 0:
wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@ -310,7 +310,7 @@ static void paint_go_karts_track_25_deg_up_to_flat(
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -388,13 +388,13 @@ static void paint_go_karts_station(
{
sub_98197C(session, imageId, 0, 0, 32, 1, 3, height, 0, 29, height + 2);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
sub_98197C(session, imageId, 0, 0, 1, 32, 3, height, 29, 0, height + 2);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 0 || direction == 2)
@ -508,14 +508,14 @@ static void paint_go_karts_track_left_quarter_turn_1_tile(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}

36
src/openrct2/ride/transport/Chairlift.cpp
View File

@ -260,7 +260,7 @@ static void chairlift_paint_station_ne_sw(
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
paint_util_set_general_support_height(session, height + 32, 0x20);
}
@ -351,7 +351,7 @@ static void chairlift_paint_station_se_nw(
imageId = SPR_CHAIRLIFT_STATION_COLUMN_SE_NW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 16, 30, 1, 1, 7, height + 2, 16, 1, height + 2); // bound offset x is wrong?
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -382,13 +382,13 @@ static void chairlift_paint_flat(
{
imageId = SPR_CHAIRLIFT_CABLE_FLAT_SE_NW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 6, 32, 2, height, 13, 0, height + 28);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
imageId = SPR_CHAIRLIFT_CABLE_FLAT_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 6, 2, height, 0, 13, height + 28);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -407,25 +407,25 @@ static void chairlift_paint_25_deg_up(
case 0:
imageId = SPR_CHAIRLIFT_CABLE_UP_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 6, 2, height, 0, 13, height + 28);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
imageId = SPR_CHAIRLIFT_CABLE_UP_NW_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 6, 32, 2, height, 13, 0, height + 28);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
imageId = SPR_CHAIRLIFT_CABLE_UP_NE_SW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 6, 2, height, 0, 13, height + 28);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
imageId = SPR_CHAIRLIFT_CABLE_UP_SE_NW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 6, 32, 2, height, 13, 0, height + 28);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -449,7 +449,7 @@ static void chairlift_paint_flat_to_25_deg_up(
imageId = SPR_20520 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
@ -459,7 +459,7 @@ static void chairlift_paint_flat_to_25_deg_up(
imageId = SPR_20521 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1);
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 2:
@ -469,7 +469,7 @@ static void chairlift_paint_flat_to_25_deg_up(
imageId = SPR_20522 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1);
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
case 3:
@ -479,7 +479,7 @@ static void chairlift_paint_flat_to_25_deg_up(
imageId = SPR_20523 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -504,7 +504,7 @@ static void chairlift_paint_25_deg_up_to_flat(
imageId = SPR_20524 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
@ -534,7 +534,7 @@ static void chairlift_paint_25_deg_up_to_flat(
imageId = SPR_20527 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -586,7 +586,7 @@ static void chairlift_paint_left_quarter_turn_1_tile(
imageId = SPR_20536 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 2, 2, 27, height, 28, 4, height);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
@ -610,7 +610,7 @@ static void chairlift_paint_left_quarter_turn_1_tile(
imageId = SPR_20538 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 2, 2, 27, height, 16, 28, height);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
@ -623,8 +623,8 @@ static void chairlift_paint_left_quarter_turn_1_tile(
imageId = SPR_20539 | session->TrackColours[SCHEME_SUPPORTS];
sub_98197C(session, imageId, 0, 0, 2, 2, 27, height, 16, 28, height);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}

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

@ -658,7 +658,7 @@ static void paint_miniature_railway_track_flat(
}
}
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -679,7 +679,7 @@ static void paint_miniature_railway_station(
imageId = miniature_railway_track_pieces_flat_station[direction] | session->TrackColours[SCHEME_TRACK];
sub_98199C_rotated(session, direction, imageId, 0, 6, 32, 20, 2, height, 0, 0, height);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
track_paint_util_draw_station_3(session, rideIndex, direction, height + 2, height, tileElement);
// covers shouldn't be offset by +2
@ -700,16 +700,16 @@ static void paint_miniature_railway_track_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -732,16 +732,16 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -764,7 +764,7 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_14);
@ -773,7 +773,7 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(
paint_util_push_tunnel_left(session, height + 8, TUNNEL_14);
break;
case 3:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -956,22 +956,22 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(
}
if (direction == 0 && trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 0 && trackSequence == 6)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 1 && trackSequence == 6)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 3 && trackSequence == 0)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
int32_t blockedSegments = 0;
@ -1085,14 +1085,14 @@ static void paint_miniature_railway_track_s_bend_left(
{
if (trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
}
else
{
if (trackSequence == 3)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
}
@ -1186,14 +1186,14 @@ static void paint_miniature_railway_track_s_bend_right(
{
if (trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
}
else
{
if (trackSequence == 3)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
}
@ -1309,7 +1309,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(
session, imageId, static_cast<int8_t>(offset.x), static_cast<int8_t>(offset.y), boundsLength.x, boundsLength.y, 3,
height, boundsOffset.x, boundsOffset.y, height + boundsOffset.z);
}
track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_SQUARE_FLAT);
int32_t blockedSegments = 0;
switch (trackSequence)
@ -1468,11 +1468,11 @@ static void paint_miniature_railway_track_left_eighth_to_diag(
if (direction == 0 && trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 3 && trackSequence == 0)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -1610,11 +1610,11 @@ static void paint_miniature_railway_track_right_eighth_to_diag(
if (direction == 0 && trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 3 && trackSequence == 0)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);

46
src/openrct2/ride/transport/Monorail.cpp
View File

@ -435,11 +435,11 @@ static void paint_monorail_track_flat(
if (direction == 0 || direction == 2)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
if (track_paint_util_should_paint_supports(session->MapPosition))
@ -482,11 +482,11 @@ static void paint_monorail_station(
if (direction == 0 || direction == 2)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 0 || direction == 2)
@ -525,16 +525,16 @@ static void paint_monorail_track_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -567,16 +567,16 @@ static void paint_monorail_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
case 3:
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -609,7 +609,7 @@ static void paint_monorail_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
paint_util_push_tunnel_left(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
paint_util_push_tunnel_right(session, height + 8, TUNNEL_14);
@ -618,7 +618,7 @@ static void paint_monorail_track_25_deg_up_to_flat(
paint_util_push_tunnel_left(session, height + 8, TUNNEL_14);
break;
case 3:
paint_util_push_tunnel_right(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -676,22 +676,22 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(
if (direction == 0 && trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 0 && trackSequence == 6)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 1 && trackSequence == 6)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
if (direction == 3 && trackSequence == 0)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
int32_t blockedSegments = 0;
@ -771,7 +771,7 @@ static void paint_monorail_track_s_bend_left(
{
if (trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
switch (trackSequence)
@ -794,7 +794,7 @@ static void paint_monorail_track_s_bend_left(
{
if (trackSequence == 3)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
switch (trackSequence)
@ -877,7 +877,7 @@ static void paint_monorail_track_s_bend_right(
{
if (trackSequence == 0)
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
switch (trackSequence)
@ -900,7 +900,7 @@ static void paint_monorail_track_s_bend_right(
{
if (trackSequence == 3)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
switch (trackSequence)
@ -950,7 +950,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(
session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
monorail_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets,
defaultRightQuarterTurn3TilesBoundLengths, nullptr);
track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_SQUARE_FLAT);
switch (trackSequence)
{

42
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_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -73,7 +73,7 @@ static void suspended_monorail_track_station(
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, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}
@ -134,11 +134,11 @@ static void suspended_monorail_track_25_deg_up(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_general_support_height(session, height + 72, 0x20);
}
@ -199,11 +199,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_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_general_support_height(session, height + 64, 0x20);
}
@ -264,7 +264,7 @@ 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_9);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_INVERTED_9);
}
else
{
@ -337,7 +337,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -466,10 +466,10 @@ static void suspended_monorail_track_left_quarter_turn_5(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_9);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_9);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -525,7 +525,7 @@ static void suspended_monorail_track_s_bend_left(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -646,10 +646,10 @@ static void suspended_monorail_track_s_bend_left(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_9);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_9);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -696,7 +696,7 @@ static void suspended_monorail_track_s_bend_right(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -817,10 +817,10 @@ static void suspended_monorail_track_s_bend_right(
switch (direction)
{
case 1:
paint_util_push_tunnel_right(session, height, TUNNEL_9);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
case 2:
paint_util_push_tunnel_left(session, height, TUNNEL_9);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -868,7 +868,7 @@ static void suspended_monorail_track_left_quarter_turn_3(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -936,10 +936,10 @@ static void suspended_monorail_track_left_quarter_turn_3(
switch (direction)
{
case 2:
paint_util_push_tunnel_right(session, height, TUNNEL_9);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
case 3:
paint_util_push_tunnel_left(session, height, TUNNEL_9);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_INVERTED_9);
break;
}
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -995,7 +995,7 @@ static void suspended_monorail_track_left_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;
@ -1158,7 +1158,7 @@ static void suspended_monorail_track_right_eighth_to_diag(
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
}
paint_util_set_general_support_height(session, height + 48, 0x20);
break;

4
src/openrct2/ride/water/BoatHire.cpp
View File

@ -71,13 +71,13 @@ static void paint_boat_hire_station(
if (direction & 1)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
track_paint_util_draw_pier(
session, ride, stationObj, session->MapPosition, direction, height, tileElement, session->CurrentRotation);
}
else
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
track_paint_util_draw_pier(
session, ride, stationObj, session->MapPosition, direction, height, tileElement, session->CurrentRotation);
}

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

@ -411,7 +411,7 @@ static void dinghy_slide_track_station(
track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);

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

@ -213,7 +213,7 @@ static void paint_log_flume_track_station(
track_paint_util_draw_station_3(session, rideIndex, direction, height + 2, height, tileElement);
// Covers shouldn't be offset by +2
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -777,7 +777,7 @@ static void paint_log_flume_track_on_ride_photo(
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}

52
src/openrct2/ride/water/RiverRapids.cpp
View File

@ -305,11 +305,11 @@ static void paint_river_rapids_track_flat(
if (direction & 1)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -344,7 +344,7 @@ static void paint_river_rapids_track_25_deg(
sub_98197C(session, imageId, 0, 0, 32, 1, 34, height, 0, 27, height + 16);
wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
@ -356,7 +356,7 @@ static void paint_river_rapids_track_25_deg(
sub_98197C(session, imageId, 0, 0, 1, 32, 34, height, 27, 0, height + 16);
wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_right(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
@ -368,7 +368,7 @@ static void paint_river_rapids_track_25_deg(
sub_98197C(session, imageId, 0, 0, 32, 1, 34, height, 0, 27, height + 16);
wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_8);
paint_util_push_tunnel_left(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
@ -379,7 +379,7 @@ static void paint_river_rapids_track_25_deg(
sub_98197C(session, imageId, 0, 0, 1, 32, 34, height, 27, 0, height + 16);
wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_7);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -403,7 +403,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(
sub_98197C(session, imageId, 0, 0, 32, 1, 18, height, 0, 27, height + 16);
wooden_a_supports_paint_setup(session, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_left(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
@ -438,7 +438,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(
sub_98197C(session, imageId, 0, 0, 1, 32, 18, height, 27, 0, height + 16);
wooden_a_supports_paint_setup(session, 1, 8, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_6);
paint_util_push_tunnel_right(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -462,7 +462,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
sub_98197C(session, imageId, 0, 0, 32, 1, 26, height, 0, 27, height + 16);
wooden_a_supports_paint_setup(session, 0, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
@ -474,7 +474,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
sub_98197C(session, imageId, 0, 0, 1, 32, 26, height, 27, 0, height + 16);
wooden_a_supports_paint_setup(session, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_8);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_8);
break;
case 2:
@ -486,7 +486,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
sub_98197C(session, imageId, 0, 0, 32, 1, 26, height, 0, 27, height + 16);
wooden_a_supports_paint_setup(session, 0, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_left(session, height, TUNNEL_8);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_8);
break;
case 3:
@ -497,7 +497,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
sub_98197C(session, imageId, 0, 0, 1, 32, 26, height, 27, 0, height + 16);
wooden_a_supports_paint_setup(session, 1, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -570,7 +570,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(
imageId = SPR_RIVER_RAPIDS_LEFT_QUARTER_TURN_1_TILE_FRONT_SW_NW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 2, 1, 7, height, 28, 27, height + 13);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
@ -591,7 +591,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(
imageId = SPR_RIVER_RAPIDS_LEFT_QUARTER_TURN_1_TILE_FRONT_NE_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 1, 2, 7, height, 27, 28, height + 13);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
@ -601,8 +601,8 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(
imageId = SPR_RIVER_RAPIDS_LEFT_QUARTER_TURN_1_TILE_FRONT_SE_SW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 1, 1, 7, height, 28, 28, height + 13);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -627,8 +627,8 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(
imageId = SPR_RIVER_RAPIDS_RIGHT_QUARTER_TURN_1_TILE_FRONT_SW_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 1, 1, 7, height, 28, 28, height + 13);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
@ -638,7 +638,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(
imageId = SPR_RIVER_RAPIDS_RIGHT_QUARTER_TURN_1_TILE_FRONT_SE_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 2, 1, 7, height, 28, 27, height + 13);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
break;
case 2:
@ -659,7 +659,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(
imageId = SPR_RIVER_RAPIDS_RIGHT_QUARTER_TURN_1_TILE_FRONT_NW_SW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 1, 28, 7, height, 27, 2, height + 13);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -720,11 +720,11 @@ static void paint_river_rapids_track_waterfall(
if (direction & 1)
{
paint_util_push_tunnel_right(session, height, TUNNEL_9);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_INVERTED_9);
}
else
{
paint_util_push_tunnel_left(session, height, TUNNEL_9);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_INVERTED_9);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -761,11 +761,11 @@ static void paint_river_rapids_track_rapids(
if (direction & 1)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -822,11 +822,11 @@ static void paint_river_rapids_track_whirlpool(
if (direction & 1)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);

60
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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 104, 0x20);
@ -538,11 +538,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
@ -563,7 +563,7 @@ 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_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
else
{
@ -588,11 +588,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -613,11 +613,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_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 72, 0x20);
@ -639,11 +639,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_8);
paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 56, 0x20);
@ -676,7 +676,7 @@ static void paint_splash_boats_track_flat_to_25_deg_down(
}
else
{
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 40, 0x20);
@ -716,18 +716,18 @@ static void paint_splash_boats_track_25_deg_down_to_flat(
{
#ifdef __TESTPAINT__
// FIXME: For some reason, Testpaint does not detect this as an error.
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7);
#else
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8);
#endif
}
else
{
#ifdef __TESTPAINT__
// FIXME: For some reason, Testpaint does not detect this as an error.
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8);
paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_8);
#else
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
#endif
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -767,11 +767,11 @@ static void paint_splash_boats_track_flat(
if (direction & 1)
{
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
}
else
{
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -808,7 +808,7 @@ static void paint_splash_boats_station(
if (ride != nullptr)
track_paint_util_draw_station_platform(session, ride, direction, height, 7, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 32, 0x20);
@ -881,13 +881,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
break;
case 6:
if (direction == 2 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_SQUARE_FLAT);
}
break;
}
@ -962,13 +962,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_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
break;
case 6:
if (direction == 0 || direction == 1)
{
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_SQUARE_FLAT);
}
break;
}
@ -1054,14 +1054,14 @@ static void paint_splash_boats_track_s_bend_left(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
}
@ -1146,14 +1146,14 @@ static void paint_splash_boats_track_s_bend_right(
{
if (direction == 0 || direction == 3)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
}
}
else if (trackSequence == 3)
{
if (direction == 1 || direction == 2)
{
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(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, rideIndex, trackSequence, direction, height, tileElement);
track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + 48, 0x20);
}

4
src/openrct2/ride/water/SubmarineRide.cpp
View File

@ -95,7 +95,7 @@ static void submarine_ride_paint_track_station(
imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower);
paint_util_push_tunnel_right(session, height, TUNNEL_6);
paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_FLAT);
track_paint_util_draw_pier(
session, ride, stationObj, session->MapPosition, direction, height, tileElement, session->CurrentRotation);
}
@ -104,7 +104,7 @@ static void submarine_ride_paint_track_station(
imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower);
paint_util_push_tunnel_left(session, height, TUNNEL_6);
paint_util_push_tunnel_left(session, height, TUNNEL_SQUARE_FLAT);
track_paint_util_draw_pier(
session, ride, stationObj, session->MapPosition, direction, height, tileElement, session->CurrentRotation);
}