diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 9df586bd02..7bb2961963 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -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 diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index c8d93aeb6d..982c3eb63f 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -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); } } diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.h b/src/openrct2/paint/tile_element/Paint.TileElement.h index 07ffb55b62..d980309ee2 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.h +++ b/src/openrct2/paint/tile_element/Paint.TileElement.h @@ -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, diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index c7f11fd1e9..2dca8b532e 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 77daced4b8..d7336f1082 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 680a35b980..33222386ad 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -71,7 +71,7 @@ void bolliger_mabillard_track_flat( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -109,7 +109,7 @@ void bolliger_mabillard_track_station( if (ride != nullptr) track_paint_util_draw_station_platform(session, ride, direction, height, 9, 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); } @@ -172,11 +172,11 @@ void bolliger_mabillard_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); @@ -241,11 +241,11 @@ void bolliger_mabillard_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); @@ -310,11 +310,11 @@ void bolliger_mabillard_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); @@ -387,11 +387,11 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -464,11 +464,11 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -533,7 +533,7 @@ void bolliger_mabillard_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 { @@ -621,7 +621,7 @@ void bolliger_mabillard_track_left_quarter_turn_5( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -742,10 +742,10 @@ void bolliger_mabillard_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( @@ -795,7 +795,7 @@ void bolliger_mabillard_track_flat_to_left_bank( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -832,7 +832,7 @@ void bolliger_mabillard_track_flat_to_right_bank( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -869,7 +869,7 @@ void bolliger_mabillard_track_left_bank_to_flat( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -906,7 +906,7 @@ void bolliger_mabillard_track_right_bank_to_flat( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -947,7 +947,7 @@ void bolliger_mabillard_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); @@ -1075,10 +1075,10 @@ void bolliger_mabillard_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( @@ -1130,11 +1130,11 @@ void bolliger_mabillard_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); @@ -1174,11 +1174,11 @@ void bolliger_mabillard_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); @@ -1218,7 +1218,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_bank( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -1262,7 +1262,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_bank( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -1332,7 +1332,7 @@ void bolliger_mabillard_track_left_bank( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1375,7 +1375,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -1496,10 +1496,10 @@ void bolliger_mabillard_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( @@ -1538,7 +1538,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -1659,10 +1659,10 @@ void bolliger_mabillard_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( @@ -1719,7 +1719,7 @@ void bolliger_mabillard_track_s_bend_left( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1807,10 +1807,10 @@ void bolliger_mabillard_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( @@ -1849,7 +1849,7 @@ void bolliger_mabillard_track_s_bend_right( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1937,10 +1937,10 @@ void bolliger_mabillard_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( @@ -1982,7 +1982,7 @@ void bolliger_mabillard_track_left_vertical_loop( } 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, @@ -2196,10 +2196,10 @@ void bolliger_mabillard_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( @@ -2241,7 +2241,7 @@ void bolliger_mabillard_track_right_vertical_loop( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7); } paint_util_set_general_support_height(session, height + 56, 0x20); break; @@ -2423,10 +2423,10 @@ void bolliger_mabillard_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); @@ -2465,7 +2465,7 @@ void bolliger_mabillard_track_left_quarter_turn_3( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -2525,10 +2525,10 @@ void bolliger_mabillard_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( @@ -2580,7 +2580,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -2645,10 +2645,10 @@ void bolliger_mabillard_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( @@ -2696,7 +2696,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -2732,10 +2732,10 @@ void bolliger_mabillard_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( @@ -2774,7 +2774,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -2813,10 +2813,10 @@ void bolliger_mabillard_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( @@ -2877,7 +2877,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small( metal_a_supports_paint_setup(session, supportType, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -2943,10 +2943,10 @@ void bolliger_mabillard_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( @@ -2982,10 +2982,10 @@ void bolliger_mabillard_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( @@ -3051,7 +3051,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small( metal_a_supports_paint_setup(session, supportType, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -3094,7 +3094,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small( metal_a_supports_paint_setup(session, supportType, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -3160,10 +3160,10 @@ void bolliger_mabillard_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( @@ -3199,10 +3199,10 @@ void bolliger_mabillard_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( @@ -3268,7 +3268,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small( metal_a_supports_paint_setup(session, supportType, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -3339,7 +3339,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large( metal_a_supports_paint_setup(session, supportType, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -3467,10 +3467,10 @@ void bolliger_mabillard_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( @@ -3506,10 +3506,10 @@ void bolliger_mabillard_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( @@ -3637,7 +3637,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large( metal_a_supports_paint_setup(session, supportType, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -3680,7 +3680,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large( metal_a_supports_paint_setup(session, supportType, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -3811,10 +3811,10 @@ void bolliger_mabillard_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( @@ -3850,10 +3850,10 @@ void bolliger_mabillard_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 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -4053,7 +4053,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 17304, 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); } @@ -4089,7 +4089,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 17299, 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); } @@ -4131,7 +4131,7 @@ void bolliger_mabillard_track_brakes( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -4166,11 +4166,11 @@ void bolliger_mabillard_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); @@ -4206,11 +4206,11 @@ void bolliger_mabillard_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); @@ -4253,7 +4253,7 @@ void bolliger_mabillard_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); } @@ -4352,7 +4352,7 @@ void bolliger_mabillard_track_60_deg_up_to_90_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7); } paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height( @@ -4398,10 +4398,10 @@ void bolliger_mabillard_track_90_deg_up_to_60_deg_up( switch (direction) { case 1: - paint_util_push_tunnel_right(session, height + 48, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_SQUARE_8); break; case 2: - paint_util_push_tunnel_left(session, height + 48, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_SQUARE_8); break; } paint_util_set_segment_support_height( @@ -4441,7 +4441,7 @@ void bolliger_mabillard_track_60_deg_down_to_90_deg_down( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_SQUARE_8); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -4481,7 +4481,7 @@ void bolliger_mabillard_track_left_eighth_to_diag( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -4615,7 +4615,7 @@ void bolliger_mabillard_track_right_eighth_to_diag( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -4768,7 +4768,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -4905,7 +4905,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -8550,7 +8550,7 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -8586,10 +8586,10 @@ void bolliger_mabillard_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( @@ -8631,7 +8631,7 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -8670,10 +8670,10 @@ void bolliger_mabillard_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( @@ -8715,7 +8715,7 @@ void bolliger_mabillard_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, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -8754,10 +8754,10 @@ void bolliger_mabillard_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( @@ -8796,7 +8796,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_8); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -8835,10 +8835,10 @@ void bolliger_mabillard_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( @@ -8869,7 +8869,7 @@ void bolliger_mabillard_track_block_brakes( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -8905,7 +8905,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -8943,10 +8943,10 @@ void bolliger_mabillard_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( @@ -8986,7 +8986,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -9027,10 +9027,10 @@ void bolliger_mabillard_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( @@ -9088,7 +9088,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -9214,10 +9214,10 @@ void bolliger_mabillard_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( @@ -9257,7 +9257,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -9383,10 +9383,10 @@ void bolliger_mabillard_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( @@ -9445,11 +9445,11 @@ void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -9487,11 +9487,11 @@ void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -9529,11 +9529,11 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -9571,11 +9571,11 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -9643,11 +9643,11 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -9683,11 +9683,11 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -9723,7 +9723,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -9763,7 +9763,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -9837,11 +9837,11 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -9879,11 +9879,11 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -9921,7 +9921,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_flat( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -9963,7 +9963,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_flat( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -10179,11 +10179,11 @@ void bolliger_mabillard_track_flat_to_60_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 + 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); @@ -10254,11 +10254,11 @@ void bolliger_mabillard_track_60_deg_up_to_flat( } 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_6); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -10311,11 +10311,11 @@ void bolliger_mabillard_track_brake_for_drop( metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_SQUARE_FLAT); } 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); @@ -10352,7 +10352,7 @@ void bolliger_mabillard_track_half_loop_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -10438,7 +10438,7 @@ void bolliger_mabillard_track_half_loop_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, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -10489,7 +10489,7 @@ void bolliger_mabillard_track_left_corkscrew_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_general_support_height(session, height + 48, 0x20); break; @@ -10553,10 +10553,10 @@ void bolliger_mabillard_track_left_corkscrew_up( 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_general_support_height(session, height + 48, 0x20); @@ -10597,7 +10597,7 @@ void bolliger_mabillard_track_right_corkscrew_up( metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -10664,10 +10664,10 @@ void bolliger_mabillard_track_right_corkscrew_up( 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_general_support_height(session, height + 48, 0x20); @@ -10723,7 +10723,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -10814,10 +10814,10 @@ void bolliger_mabillard_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( @@ -10862,7 +10862,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -10951,10 +10951,10 @@ void bolliger_mabillard_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( @@ -11024,7 +11024,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down( } 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), @@ -11105,10 +11105,10 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down( 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_segment_support_height( @@ -11163,7 +11163,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down( } 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), @@ -11244,10 +11244,10 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down( 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_segment_support_height( @@ -11300,11 +11300,11 @@ void bolliger_mabillard_track_powered_lift( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -11340,7 +11340,7 @@ void bolliger_mabillard_track_left_large_half_loop_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -11519,7 +11519,7 @@ void bolliger_mabillard_track_left_large_half_loop_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, @@ -11560,7 +11560,7 @@ void bolliger_mabillard_track_right_large_half_loop_up( metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -11739,7 +11739,7 @@ void bolliger_mabillard_track_right_large_half_loop_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, @@ -11855,7 +11855,7 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -11901,7 +11901,7 @@ void bolliger_mabillard_track_booster( { metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 48387220e3..ad01bde432 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 20e829c116..3e5f256a2d 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -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( diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index eba4f97088..45d7a02704 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -75,7 +75,7 @@ static void flying_rc_track_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 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); @@ -127,7 +127,7 @@ static void flying_rc_track_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -184,7 +184,7 @@ static void flying_rc_track_station( 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); } @@ -222,11 +222,11 @@ static void flying_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); @@ -314,11 +314,11 @@ static void flying_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_general_support_height(session, height + 56, 0x20); } @@ -357,11 +357,11 @@ static void flying_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); @@ -394,11 +394,11 @@ static void flying_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); @@ -439,11 +439,11 @@ static void flying_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); @@ -531,11 +531,11 @@ static void flying_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_general_support_height(session, height + 48, 0x20); } @@ -578,11 +578,11 @@ static void flying_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); @@ -621,11 +621,11 @@ static void flying_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); @@ -670,11 +670,11 @@ static void flying_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); @@ -739,11 +739,11 @@ static void flying_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_general_support_height(session, height + 72, 0x20); } @@ -782,7 +782,7 @@ static void flying_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 { @@ -874,7 +874,7 @@ static void flying_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 { @@ -969,7 +969,7 @@ static void flying_rc_track_left_quarter_turn_5( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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, @@ -1102,10 +1102,10 @@ static void flying_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( @@ -1153,7 +1153,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -1289,10 +1289,10 @@ static void flying_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_general_support_height(session, height + 32, 0x20); @@ -1345,7 +1345,7 @@ static void flying_rc_track_flat_to_left_bank( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1386,7 +1386,7 @@ static void flying_rc_track_flat_to_left_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -1426,7 +1426,7 @@ static void flying_rc_track_flat_to_right_bank( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1467,7 +1467,7 @@ static void flying_rc_track_flat_to_right_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -1507,7 +1507,7 @@ static void flying_rc_track_left_bank_to_flat( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1548,7 +1548,7 @@ static void flying_rc_track_left_bank_to_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -1588,7 +1588,7 @@ static void flying_rc_track_right_bank_to_flat( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1629,7 +1629,7 @@ static void flying_rc_track_right_bank_to_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -1674,7 +1674,7 @@ static void flying_rc_track_banked_left_quarter_turn_5( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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, @@ -1810,10 +1810,10 @@ static void flying_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( @@ -1861,7 +1861,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -1992,10 +1992,10 @@ static void flying_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_general_support_height(session, height + 32, 0x20); @@ -2050,11 +2050,11 @@ static void flying_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); @@ -2115,11 +2115,11 @@ static void flying_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_general_support_height(session, height + 48, 0x20); } @@ -2162,11 +2162,11 @@ static void flying_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); @@ -2227,11 +2227,11 @@ static void flying_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_general_support_height(session, height + 48, 0x20); } @@ -2274,7 +2274,7 @@ static void flying_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 { @@ -2339,7 +2339,7 @@ static void flying_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 { @@ -2386,7 +2386,7 @@ static void flying_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 { @@ -2451,7 +2451,7 @@ static void flying_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 { @@ -2524,7 +2524,7 @@ static void flying_rc_track_left_bank( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -2565,7 +2565,7 @@ static void flying_rc_track_left_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -2615,7 +2615,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -2743,10 +2743,10 @@ static void flying_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( @@ -2790,7 +2790,7 @@ static void flying_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_general_support_height(session, height + 72, 0x20); break; @@ -2910,10 +2910,10 @@ static void flying_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_general_support_height(session, height + 72, 0x20); @@ -2959,7 +2959,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -3087,10 +3087,10 @@ static void flying_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( @@ -3134,7 +3134,7 @@ static void flying_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_general_support_height(session, height + 72, 0x20); break; @@ -3254,10 +3254,10 @@ static void flying_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_general_support_height(session, height + 72, 0x20); @@ -3321,7 +3321,7 @@ static void flying_rc_track_s_bend_left( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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, @@ -3423,10 +3423,10 @@ static void flying_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( @@ -3473,7 +3473,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -3599,10 +3599,10 @@ static void flying_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_general_support_height(session, height + 32, 0x20); @@ -3648,7 +3648,7 @@ static void flying_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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, @@ -3750,10 +3750,10 @@ static void flying_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( @@ -3800,7 +3800,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -3926,10 +3926,10 @@ static void flying_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_general_support_height(session, height + 32, 0x20); @@ -3975,7 +3975,7 @@ static void flying_rc_track_left_quarter_turn_3( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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, @@ -4043,10 +4043,10 @@ static void flying_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( @@ -4094,7 +4094,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -4165,10 +4165,10 @@ static void flying_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_general_support_height(session, height + 32, 0x20); @@ -4226,7 +4226,7 @@ static void flying_rc_track_left_quarter_turn_3_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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, @@ -4297,10 +4297,10 @@ static void flying_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( @@ -4348,7 +4348,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -4419,10 +4419,10 @@ static void flying_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_general_support_height(session, height + 32, 0x20); @@ -4473,7 +4473,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -4511,10 +4511,10 @@ static void flying_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( @@ -4558,7 +4558,7 @@ static void flying_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_general_support_height(session, height + 72, 0x20); break; @@ -4599,10 +4599,10 @@ static void flying_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_general_support_height(session, height + 72, 0x20); @@ -4644,7 +4644,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -4688,10 +4688,10 @@ static void flying_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( @@ -4735,7 +4735,7 @@ static void flying_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_general_support_height(session, height + 72, 0x20); break; @@ -4776,10 +4776,10 @@ static void flying_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_general_support_height(session, height + 72, 0x20); @@ -4841,7 +4841,7 @@ static void flying_rc_track_left_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -4908,10 +4908,10 @@ static void flying_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( @@ -4948,10 +4948,10 @@ static void flying_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( @@ -5018,7 +5018,7 @@ static void flying_rc_track_left_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -5063,7 +5063,7 @@ static void flying_rc_track_right_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -5130,10 +5130,10 @@ static void flying_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( @@ -5170,10 +5170,10 @@ static void flying_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( @@ -5240,7 +5240,7 @@ static void flying_rc_track_right_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -5315,7 +5315,7 @@ static void flying_rc_track_left_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -5444,10 +5444,10 @@ static void flying_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( @@ -5484,10 +5484,10 @@ static void flying_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( @@ -5616,7 +5616,7 @@ static void flying_rc_track_left_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -5661,7 +5661,7 @@ static void flying_rc_track_right_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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), @@ -5790,10 +5790,10 @@ static void flying_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( @@ -5830,10 +5830,10 @@ static void flying_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( @@ -5962,7 +5962,7 @@ static void flying_rc_track_right_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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), @@ -6080,7 +6080,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up( } } - 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); } @@ -6162,7 +6162,7 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up( 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); } @@ -6208,7 +6208,7 @@ static void flying_rc_track_brakes( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -6239,7 +6239,7 @@ static void flying_rc_track_brakes( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -6300,7 +6300,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_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); } paint_util_set_general_support_height(session, height + 48, 0x20); break; @@ -6434,10 +6434,10 @@ static void flying_rc_track_left_quarter_banked_helix_large_up( switch (direction) { case 2: - paint_util_push_tunnel_right(session, height + 16, TUNNEL_9); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_SQUARE_INVERTED_9); break; case 3: - paint_util_push_tunnel_left(session, height + 16, TUNNEL_9); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_SQUARE_INVERTED_9); break; } paint_util_set_general_support_height(session, height + 48, 0x20); @@ -6485,7 +6485,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_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); } paint_util_set_general_support_height(session, height + 48, 0x20); break; @@ -6619,10 +6619,10 @@ static void flying_rc_track_right_quarter_banked_helix_large_up( switch (direction) { case 0: - paint_util_push_tunnel_right(session, height + 16, TUNNEL_9); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_SQUARE_INVERTED_9); break; case 1: - paint_util_push_tunnel_left(session, height + 16, TUNNEL_9); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_SQUARE_INVERTED_9); break; } paint_util_set_general_support_height(session, height + 48, 0x20); @@ -6670,7 +6670,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_INVERTED_9); } paint_util_set_general_support_height(session, height + 48, 0x20); break; @@ -6804,10 +6804,10 @@ static void flying_rc_track_left_quarter_banked_helix_large_down( 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); @@ -6855,7 +6855,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_INVERTED_9); } paint_util_set_general_support_height(session, height + 48, 0x20); break; @@ -6989,10 +6989,10 @@ static void flying_rc_track_right_quarter_banked_helix_large_down( switch (direction) { case 0: - paint_util_push_tunnel_right(session, height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_SQUARE_INVERTED_9); break; case 1: - 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); @@ -7033,11 +7033,11 @@ static void flying_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); @@ -7096,11 +7096,11 @@ static void flying_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_general_support_height(session, height + 72, 0x20); } @@ -7139,11 +7139,11 @@ static void flying_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); @@ -7202,11 +7202,11 @@ static void flying_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_general_support_height(session, height + 72, 0x20); } @@ -7259,7 +7259,7 @@ static void flying_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); } @@ -7309,7 +7309,7 @@ static void flying_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 + 64, 0x20); } @@ -7368,7 +7368,7 @@ static void flying_rc_track_left_eighth_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -7518,7 +7518,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -7682,7 +7682,7 @@ static void flying_rc_track_right_eighth_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -7832,7 +7832,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -8014,7 +8014,7 @@ static void flying_rc_track_left_eighth_bank_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -8165,7 +8165,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -8329,7 +8329,7 @@ static void flying_rc_track_right_eighth_bank_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -8480,7 +8480,7 @@ static void flying_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_general_support_height(session, height + 32, 0x20); break; @@ -14293,7 +14293,7 @@ static void flying_rc_track_left_flyer_twist_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, 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, @@ -14363,10 +14363,10 @@ static void flying_rc_track_left_flyer_twist_up( 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_general_support_height(session, height + 32, 0x20); @@ -14405,7 +14405,7 @@ static void flying_rc_track_right_flyer_twist_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, 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, @@ -14473,10 +14473,10 @@ static void flying_rc_track_right_flyer_twist_up( 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_general_support_height(session, height + 32, 0x20); @@ -14523,7 +14523,7 @@ static void flying_rc_track_left_flyer_twist_down( 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_general_support_height(session, height + 32, 0x20); break; @@ -14580,10 +14580,10 @@ static void flying_rc_track_left_flyer_twist_down( 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( @@ -14634,7 +14634,7 @@ static void flying_rc_track_right_flyer_twist_down( 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_general_support_height(session, height + 32, 0x20); break; @@ -14690,10 +14690,10 @@ static void flying_rc_track_right_flyer_twist_down( 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( @@ -14737,7 +14737,7 @@ static void flying_rc_track_flyer_half_loop_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -14827,7 +14827,7 @@ static void flying_rc_track_flyer_half_loop_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, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -14865,7 +14865,7 @@ static void flying_rc_track_flyer_half_loop_down( } 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); @@ -14957,7 +14957,7 @@ static void flying_rc_track_flyer_half_loop_down( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -14988,7 +14988,7 @@ static void flying_rc_track_block_brakes( } metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -15019,7 +15019,7 @@ static void flying_rc_track_block_brakes( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, 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_general_support_height(session, height + 32, 0x20); } } @@ -15058,7 +15058,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -15098,10 +15098,10 @@ static void flying_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( @@ -15145,7 +15145,7 @@ static void flying_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_general_support_height(session, height + 88, 0x20); break; @@ -15186,10 +15186,10 @@ static void flying_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_general_support_height(session, height + 88, 0x20); @@ -15232,7 +15232,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -15278,10 +15278,10 @@ static void flying_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( @@ -15325,7 +15325,7 @@ static void flying_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_general_support_height(session, height + 88, 0x20); break; @@ -15366,10 +15366,10 @@ static void flying_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_general_support_height(session, height + 88, 0x20); @@ -15435,7 +15435,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -15566,10 +15566,10 @@ static void flying_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( @@ -15613,7 +15613,7 @@ static void flying_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_general_support_height(session, height + 88, 0x20); break; @@ -15733,10 +15733,10 @@ static void flying_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_general_support_height(session, height + 88, 0x20); @@ -15782,7 +15782,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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, @@ -15913,10 +15913,10 @@ static void flying_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( @@ -15960,7 +15960,7 @@ static void flying_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_general_support_height(session, height + 88, 0x20); break; @@ -16080,10 +16080,10 @@ static void flying_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_general_support_height(session, height + 88, 0x20); @@ -16147,11 +16147,11 @@ static void flying_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); @@ -16210,11 +16210,11 @@ static void flying_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_general_support_height(session, height + 72, 0x20); } @@ -16255,11 +16255,11 @@ static void flying_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); @@ -16318,11 +16318,11 @@ static void flying_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_general_support_height(session, height + 72, 0x20); } @@ -16363,11 +16363,11 @@ static void flying_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); @@ -16426,11 +16426,11 @@ static void flying_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_general_support_height(session, height + 72, 0x20); } @@ -16471,11 +16471,11 @@ static void flying_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); @@ -16534,11 +16534,11 @@ static void flying_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_general_support_height(session, height + 72, 0x20); } @@ -16613,11 +16613,11 @@ static void flying_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); @@ -16676,11 +16676,11 @@ static void flying_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_general_support_height(session, height + 64, 0x20); } @@ -16719,11 +16719,11 @@ static void flying_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); @@ -16782,11 +16782,11 @@ static void flying_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_general_support_height(session, height + 64, 0x20); } @@ -16825,11 +16825,11 @@ static void flying_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 { - 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); @@ -16888,7 +16888,7 @@ static void flying_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 { @@ -16931,7 +16931,7 @@ static void flying_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 { @@ -16994,7 +16994,7 @@ static void flying_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 { @@ -17075,11 +17075,11 @@ static void flying_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); @@ -17138,11 +17138,11 @@ static void flying_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_general_support_height(session, height + 64, 0x20); } @@ -17183,11 +17183,11 @@ static void flying_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); @@ -17246,11 +17246,11 @@ static void flying_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_general_support_height(session, height + 64, 0x20); } @@ -17291,7 +17291,7 @@ static void flying_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 { @@ -17354,7 +17354,7 @@ static void flying_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 { @@ -17399,7 +17399,7 @@ static void flying_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 { @@ -17462,7 +17462,7 @@ static void flying_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 { diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 13c5017238..a430e833dc 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 8da23bbb45..3300d252de 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 2809460bac..335779e04d 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 084311d291..104376797f 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 9920c198ee..dee629feb8 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -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 { diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 6820c3db99..50ad4210cf 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 4add9c771a..ac546d71cf 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 2398971859..cda224de0b 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -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), diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index 367d3b55ec..ead9bd426b 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index 1cd5eb79bb..874fda244d 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 663647dd99..505a8dda4a 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index ffcb2229a7..b967b3bbf1 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 727c2e719d..dacd67ad32 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index f9db2cfe12..737b5d0d79 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -68,7 +68,7 @@ static void multi_dimension_rc_track_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -98,7 +98,7 @@ static void multi_dimension_rc_track_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -157,7 +157,7 @@ static void multi_dimension_rc_track_station( } } - 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); } @@ -225,11 +225,11 @@ static void multi_dimension_rc_track_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -287,11 +287,11 @@ static void multi_dimension_rc_track_25_deg_up( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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 + 56, 0x20); } @@ -330,11 +330,11 @@ static void multi_dimension_rc_track_60_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -366,11 +366,11 @@ static void multi_dimension_rc_track_60_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -441,11 +441,11 @@ static void multi_dimension_rc_track_flat_to_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -503,11 +503,11 @@ static void multi_dimension_rc_track_flat_to_25_deg_up( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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_general_support_height(session, height + 48, 0x20); } @@ -550,11 +550,11 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -592,11 +592,11 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -641,11 +641,11 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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); @@ -709,11 +709,11 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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_general_support_height(session, height + 72, 0x20); } @@ -782,7 +782,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -844,7 +844,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -941,7 +941,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1072,10 +1072,10 @@ static void multi_dimension_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( @@ -1123,7 +1123,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -1259,10 +1259,10 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); @@ -1315,7 +1315,7 @@ static void multi_dimension_rc_track_flat_to_left_bank( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -1355,7 +1355,7 @@ static void multi_dimension_rc_track_flat_to_left_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -1395,7 +1395,7 @@ static void multi_dimension_rc_track_flat_to_right_bank( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -1435,7 +1435,7 @@ static void multi_dimension_rc_track_flat_to_right_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -1475,7 +1475,7 @@ static void multi_dimension_rc_track_left_bank_to_flat( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -1515,7 +1515,7 @@ static void multi_dimension_rc_track_left_bank_to_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -1555,7 +1555,7 @@ static void multi_dimension_rc_track_right_bank_to_flat( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -1595,7 +1595,7 @@ static void multi_dimension_rc_track_right_bank_to_flat( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -1640,7 +1640,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -1774,10 +1774,10 @@ static void multi_dimension_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( @@ -1825,7 +1825,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -1956,10 +1956,10 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); @@ -2015,11 +2015,11 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -2079,11 +2079,11 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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_general_support_height(session, height + 48, 0x20); } @@ -2126,11 +2126,11 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -2190,11 +2190,11 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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_general_support_height(session, height + 48, 0x20); } @@ -2237,7 +2237,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -2301,7 +2301,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -2348,7 +2348,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -2412,7 +2412,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT); } else { @@ -2489,7 +2489,7 @@ static void multi_dimension_rc_track_left_bank( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -2529,7 +2529,7 @@ static void multi_dimension_rc_track_left_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -2579,7 +2579,7 @@ static void multi_dimension_rc_track_s_bend_left( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -2671,10 +2671,10 @@ static void multi_dimension_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); @@ -2719,7 +2719,7 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); break; @@ -2845,10 +2845,10 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); @@ -2894,7 +2894,7 @@ static void multi_dimension_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -2986,10 +2986,10 @@ static void multi_dimension_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); @@ -3034,7 +3034,7 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); break; @@ -3160,10 +3160,10 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); @@ -3209,7 +3209,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -3275,10 +3275,10 @@ static void multi_dimension_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( @@ -3326,7 +3326,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -3397,10 +3397,10 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); @@ -3458,7 +3458,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -3527,10 +3527,10 @@ static void multi_dimension_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( @@ -3578,7 +3578,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -3649,10 +3649,10 @@ static void multi_dimension_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_general_support_height(session, height + 32, 0x20); @@ -3706,7 +3706,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -3771,10 +3771,10 @@ static void multi_dimension_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( @@ -3811,10 +3811,10 @@ static void multi_dimension_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(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -3879,7 +3879,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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 + 32, 0x20); @@ -3922,7 +3922,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -3987,10 +3987,10 @@ static void multi_dimension_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(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4025,10 +4025,10 @@ static void multi_dimension_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( @@ -4095,7 +4095,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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 + 32, 0x20); @@ -4168,7 +4168,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -4295,10 +4295,10 @@ static void multi_dimension_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( @@ -4335,10 +4335,10 @@ static void multi_dimension_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(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4465,7 +4465,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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 + 32, 0x20); @@ -4508,7 +4508,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -4635,10 +4635,10 @@ static void multi_dimension_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(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -4673,10 +4673,10 @@ static void multi_dimension_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( @@ -4805,7 +4805,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_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 + 32, 0x20); @@ -4868,7 +4868,7 @@ static void multi_dimension_rc_track_brakes( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -4898,7 +4898,7 @@ static void multi_dimension_rc_track_brakes( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -4950,7 +4950,7 @@ static void multi_dimension_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); } @@ -5000,7 +5000,7 @@ static void multi_dimension_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 + 64, 0x20); } @@ -5130,7 +5130,7 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_SQUARE_7); } paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height( @@ -5171,7 +5171,7 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_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( @@ -5224,10 +5224,10 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up( switch (direction) { case 1: - paint_util_push_tunnel_right(session, height + 48, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_SQUARE_8); break; case 2: - paint_util_push_tunnel_left(session, height + 48, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_SQUARE_8); break; } paint_util_set_segment_support_height( @@ -5262,10 +5262,10 @@ static void multi_dimension_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( @@ -5309,7 +5309,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_SQUARE_8); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -5349,7 +5349,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_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); @@ -5398,7 +5398,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -5539,7 +5539,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -5703,7 +5703,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -5844,7 +5844,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -6026,7 +6026,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -6168,7 +6168,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -6332,7 +6332,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); @@ -6474,7 +6474,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -11872,7 +11872,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, @@ -11942,10 +11942,10 @@ static void multi_dimension_rc_track_left_flyer_twist_up( 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_general_support_height(session, height + 32, 0x20); @@ -11984,7 +11984,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, @@ -12052,10 +12052,10 @@ static void multi_dimension_rc_track_right_flyer_twist_up( 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_general_support_height(session, height + 32, 0x20); @@ -12102,7 +12102,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -12159,10 +12159,10 @@ static void multi_dimension_rc_track_left_flyer_twist_down( 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( @@ -12213,7 +12213,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down( if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); } paint_util_set_general_support_height(session, height + 32, 0x20); break; @@ -12269,10 +12269,10 @@ static void multi_dimension_rc_track_right_flyer_twist_down( 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( @@ -12320,7 +12320,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -12416,7 +12416,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -12506,7 +12506,7 @@ static void multi_dimension_rc_track_block_brakes( } metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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); } @@ -12536,7 +12536,7 @@ static void multi_dimension_rc_track_block_brakes( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT); paint_util_set_general_support_height(session, height + 32, 0x20); } } @@ -12632,7 +12632,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -12726,7 +12726,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -12771,7 +12771,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -12867,7 +12867,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop( } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -13026,7 +13026,7 @@ static void multi_dimension_rc_track_multidim_inverted_90_deg_up_to_flat_quarter } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_SQUARE_FLAT); } paint_util_set_segment_support_height( session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -13120,7 +13120,7 @@ static void multi_dimension_rc_track_multidim_inverted_90_deg_up_to_flat_quarter } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_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_C8 | SEGMENT_D4, direction), 0xFFFF, 0); diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index d9405be1d2..718d6716eb 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -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 diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index ece005976e..34c651be6b 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index c8130792b0..c8b9f4c4ba 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -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); diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 91be57b06f..1ca0e8844f 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 598ff2a7df..52b93d4484 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 9b5bbf824c..9fce847b81 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 795307bb74..5f66a6b3f2 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -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; } diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index cf6b661920..bd908099d5 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -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); } diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 7995f7e303..2c068f4774 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -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 { diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index 506090199e..a6d8e1e2f8 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -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); } diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index c17e0aa4f7..267acbeacc 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -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) diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index 52a18dab30..eeb28da6f2 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -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) diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 1548762976..c538c6a0c4 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -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; } diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index 688f30303e..734c6b95a6 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -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); diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index d206b8953c..22ab476c20 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -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); diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 8619a450a6..4f7829a0a1 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -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; } diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index 7d8be87768..82443aace2 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -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; } diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 5075469ef6..06e66a1f08 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -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(offset.x), static_cast(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); diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 1b7da132f0..262c221901 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -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) { diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 8069bdd190..f90256786d 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -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; diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index f2e3b6897d..b6dc00e870 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -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); } diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index 63a7978fe3..9179ce6300 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -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); diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index d45c381d67..64c8d4c65c 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -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); } diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index ed6c6d81b5..ff7fb0f822 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -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); diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 8adebb3367..26ea64a68e 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -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); } diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index 5bfd429f39..38aa5eebb9 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -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); }