From 1cc82d1cb5ca6aca1e99941070854b7bf07d6c0c Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 3 Sep 2017 01:51:59 +0100 Subject: [PATCH] Pass paint session to tunnel functions --- src/openrct2/paint/map_element/entrance.c | 4 +- src/openrct2/paint/map_element/map_element.c | 24 +- src/openrct2/paint/map_element/map_element.h | 6 +- src/openrct2/paint/map_element/path.c | 12 +- src/openrct2/paint/paint.h | 2 +- src/openrct2/paint/paint_helpers.c | 6 +- .../coaster/air_powered_vertical_coaster.c | 24 +- src/openrct2/ride/coaster/bobsleigh_coaster.c | 132 ++-- .../ride/coaster/bolliger_mabillard_track.c | 376 +++++------ .../ride/coaster/compact_inverted_coaster.c | 216 +++--- .../ride/coaster/corkscrew_roller_coaster.c | 218 +++--- .../ride/coaster/flying_roller_coaster.c | 622 +++++++++--------- src/openrct2/ride/coaster/giga_coaster.c | 286 ++++---- .../ride/coaster/heartline_twister_coaster.c | 52 +- .../ride/coaster/inverted_hairpin_coaster.c | 66 +- .../ride/coaster/inverted_impulse_coaster.c | 44 +- .../ride/coaster/inverted_roller_coaster.c | 292 ++++---- .../ride/coaster/junior_roller_coaster.c | 208 +++--- .../ride/coaster/lay_down_roller_coaster.c | 476 +++++++------- .../coaster/lim_launched_roller_coaster.c | 72 +- .../ride/coaster/looping_roller_coaster.c | 270 ++++---- src/openrct2/ride/coaster/mine_ride.c | 136 ++-- .../ride/coaster/mine_train_coaster.c | 176 ++--- .../ride/coaster/mini_roller_coaster.c | 270 ++++---- .../ride/coaster/mini_suspended_coaster.c | 44 +- .../coaster/multi_dimension_roller_coaster.c | 390 +++++------ .../ride/coaster/reverse_freefall_coaster.c | 14 +- .../ride/coaster/reverser_roller_coaster.c | 54 +- .../coaster/side_friction_roller_coaster.c | 46 +- .../ride/coaster/stand_up_roller_coaster.c | 204 +++--- src/openrct2/ride/coaster/steeplechase.c | 48 +- .../ride/coaster/suspended_swinging_coaster.c | 108 +-- src/openrct2/ride/coaster/virginia_reel.c | 40 +- src/openrct2/ride/coaster/wild_mouse.c | 42 +- .../ride/coaster/wooden_roller_coaster.c | 280 ++++---- src/openrct2/ride/coaster/wooden_wild_mouse.c | 36 +- src/openrct2/ride/gentle/car_ride.c | 64 +- src/openrct2/ride/gentle/ghost_train.c | 48 +- src/openrct2/ride/gentle/mini_golf.c | 56 +- src/openrct2/ride/gentle/mini_helicopters.c | 32 +- src/openrct2/ride/gentle/monorail_cycles.c | 24 +- src/openrct2/ride/gentle/observation_tower.c | 4 +- src/openrct2/ride/thrill/go_karts.c | 40 +- src/openrct2/ride/thrill/launched_freefall.c | 4 +- src/openrct2/ride/thrill/roto_drop.c | 4 +- src/openrct2/ride/track_paint.c | 48 +- src/openrct2/ride/transport/chairlift.c | 40 +- src/openrct2/ride/transport/lift.c | 4 +- .../ride/transport/miniature_railway.c | 52 +- src/openrct2/ride/transport/monorail.c | 56 +- .../ride/transport/suspended_monorail.c | 44 +- src/openrct2/ride/water/boat_ride.c | 4 +- src/openrct2/ride/water/dingy_slide.c | 86 +-- src/openrct2/ride/water/log_flume.c | 48 +- src/openrct2/ride/water/river_rapids.c | 56 +- src/openrct2/ride/water/splash_boats.c | 58 +- src/openrct2/ride/water/submarine_ride.c | 8 +- test/testpaint/generate.cpp | 8 +- 58 files changed, 3042 insertions(+), 3042 deletions(-) diff --git a/src/openrct2/paint/map_element/entrance.c b/src/openrct2/paint/map_element/entrance.c index 1f87f27362..de781ffa35 100644 --- a/src/openrct2/paint/map_element/entrance.c +++ b/src/openrct2/paint/map_element/entrance.c @@ -131,9 +131,9 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s } if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } if (!is_exit && diff --git a/src/openrct2/paint/map_element/map_element.c b/src/openrct2/paint/map_element/map_element.c index e946076e52..db3a99106b 100644 --- a/src/openrct2/paint/map_element/map_element.c +++ b/src/openrct2/paint/map_element/map_element.c @@ -322,30 +322,30 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) } } -void paint_util_push_tunnel_left(uint16 height, uint8 type) +void paint_util_push_tunnel_left(paint_session * session, uint16 height, uint8 type) { - gPaintSession.LeftTunnels[gPaintSession.LeftTunnelCount] = (tunnel_entry){.height = (height / 16), .type = type}; - if (gPaintSession.LeftTunnelCount < TUNNEL_MAX_COUNT - 1) { - gPaintSession.LeftTunnels[gPaintSession.LeftTunnelCount + 1] = (tunnel_entry) {0xFF, 0xFF}; - gPaintSession.LeftTunnelCount++; + session->LeftTunnels[session->LeftTunnelCount] = (tunnel_entry){.height = (height / 16), .type = type}; + if (session->LeftTunnelCount < TUNNEL_MAX_COUNT - 1) { + session->LeftTunnels[session->LeftTunnelCount + 1] = (tunnel_entry) {0xFF, 0xFF}; + session->LeftTunnelCount++; } } -void paint_util_push_tunnel_right(uint16 height, uint8 type) +void paint_util_push_tunnel_right(paint_session * session, uint16 height, uint8 type) { - gPaintSession.RightTunnels[gPaintSession.RightTunnelCount] = (tunnel_entry){.height = (height / 16), .type = type}; - if (gPaintSession.RightTunnelCount < TUNNEL_MAX_COUNT - 1) { - gPaintSession.RightTunnels[gPaintSession.RightTunnelCount + 1] = (tunnel_entry) {0xFF, 0xFF}; - gPaintSession.RightTunnelCount++; + session->RightTunnels[session->RightTunnelCount] = (tunnel_entry){.height = (height / 16), .type = type}; + if (session->RightTunnelCount < TUNNEL_MAX_COUNT - 1) { + session->RightTunnels[session->RightTunnelCount + 1] = (tunnel_entry) {0xFF, 0xFF}; + session->RightTunnelCount++; } } -void paint_util_set_vertical_tunnel(uint16 height) +void paint_util_set_vertical_tunnel(paint_session * session, uint16 height) { #ifdef __TESTPAINT__ testPaintVerticalTunnelHeight = height; #endif - gPaintSession.VerticalTunnelHeight = height / 16; + session->VerticalTunnelHeight = height / 16; } void paint_util_set_general_support_height(sint16 height, uint8 slope) diff --git a/src/openrct2/paint/map_element/map_element.h b/src/openrct2/paint/map_element/map_element.h index 1676043209..ae0dd05ca6 100644 --- a/src/openrct2/paint/map_element/map_element.h +++ b/src/openrct2/paint/map_element/map_element.h @@ -85,9 +85,9 @@ extern bool gShowSupportSegmentHeights; extern const rct_xy16 BannerBoundBoxes[][2]; -void paint_util_push_tunnel_left(uint16 height, uint8 type); -void paint_util_push_tunnel_right(uint16 height, uint8 type); -void paint_util_set_vertical_tunnel(uint16 height); +void paint_util_push_tunnel_left(paint_session * session, uint16 height, uint8 type); +void paint_util_push_tunnel_right(paint_session * session, uint16 height, uint8 type); +void paint_util_set_vertical_tunnel(paint_session * session, uint16 height); void paint_util_set_general_support_height(sint16 height, uint8 slope); void paint_util_force_set_general_support_height(sint16 height, uint8 slope); diff --git a/src/openrct2/paint/map_element/path.c b/src/openrct2/paint/map_element/path.c index 273de67754..014a71dc20 100644 --- a/src/openrct2/paint/map_element/path.c +++ b/src/openrct2/paint/map_element/path.c @@ -644,11 +644,11 @@ static void sub_6A3F61(paint_session * session, rct_map_element * map_element, u if (bp & 2) { // Bottom right of tile is a tunnel if (bl == 5) { - paint_util_push_tunnel_right(height + 16, TUNNEL_10); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_10); } else if (bp & 1) { - paint_util_push_tunnel_right(height, TUNNEL_11); + paint_util_push_tunnel_right(session, height, TUNNEL_11); } else { - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); } } @@ -658,11 +658,11 @@ static void sub_6A3F61(paint_session * session, rct_map_element * map_element, u // Bottom left of the tile is a tunnel if (bl == 6) { - paint_util_push_tunnel_left(height + 16, TUNNEL_10); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_10); } else if (bp & 8) { - paint_util_push_tunnel_left(height , TUNNEL_11); + paint_util_push_tunnel_left(session, height , TUNNEL_11); } else { - paint_util_push_tunnel_left(height , TUNNEL_10); + paint_util_push_tunnel_left(session, height , TUNNEL_10); } } diff --git a/src/openrct2/paint/paint.h b/src/openrct2/paint/paint.h index 3e4bff69f1..fe4a458d7f 100644 --- a/src/openrct2/paint/paint.h +++ b/src/openrct2/paint/paint.h @@ -220,7 +220,7 @@ paint_struct * sub_98196C_rotated(uint8 direction, uint32 image_id, sint8 x_offs paint_struct * sub_98197C_rotated(uint8 direction, uint32 image_id, sint8 x_offset, sint8 y_offset, sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z, sint16 z_offset, sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z); paint_struct * sub_98199C_rotated(uint8 direction, uint32 image_id, sint8 x_offset, sint8 y_offset, sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z, sint16 z_offset, sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z); -void paint_util_push_tunnel_rotated(uint8 direction, uint16 height, uint8 type); +void paint_util_push_tunnel_rotated(paint_session * session, uint8 direction, uint16 height, uint8 type); bool paint_attach_to_previous_attach(paint_session * session, uint32 image_id, uint16 x, uint16 y); bool paint_attach_to_previous_ps(paint_session * session, uint32 image_id, uint16 x, uint16 y); diff --git a/src/openrct2/paint/paint_helpers.c b/src/openrct2/paint/paint_helpers.c index 2e6d1d8a5b..130706e9c2 100644 --- a/src/openrct2/paint/paint_helpers.c +++ b/src/openrct2/paint/paint_helpers.c @@ -62,11 +62,11 @@ paint_struct * sub_98199C_rotated( } } -void paint_util_push_tunnel_rotated(uint8 direction, uint16 height, uint8 type) +void paint_util_push_tunnel_rotated(paint_session * session, uint8 direction, uint16 height, uint8 type) { if (direction & 1) { - paint_util_push_tunnel_right(height, type); + paint_util_push_tunnel_right(session, height, type); } else { - paint_util_push_tunnel_left(height, type); + paint_util_push_tunnel_left(session, height, type); } } diff --git a/src/openrct2/ride/coaster/air_powered_vertical_coaster.c b/src/openrct2/ride/coaster/air_powered_vertical_coaster.c index 7ff2f1aba7..7798263651 100644 --- a/src/openrct2/ride/coaster/air_powered_vertical_coaster.c +++ b/src/openrct2/ride/coaster/air_powered_vertical_coaster.c @@ -193,7 +193,7 @@ static void air_powered_vertical_rc_track_flat(paint_session * session, uint8 ri wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -216,7 +216,7 @@ static void air_powered_vertical_rc_track_station(paint_session * session, uint8 rct_ride * ride = get_ride(rideIndex); track_paint_util_draw_station_platform(session, ride, direction, height, 5, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -298,7 +298,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(paint_session * sess wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -324,7 +324,7 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(paint_session * ses wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -425,7 +425,7 @@ static void air_powered_vertical_rc_track_left_bank(paint_session * session, uin wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -450,7 +450,7 @@ static void air_powered_vertical_rc_track_brakes(paint_session * session, uint8 wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -566,7 +566,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess wooden_a_supports_paint_setup(session, 0, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + supportHeights[trackSequence], 0x20); @@ -589,7 +589,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (trackSequence == 0) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -636,7 +636,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess } wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_set_vertical_tunnel(height + 240); + paint_util_set_vertical_tunnel(session, height + 240); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + supportHeights[trackSequence], 0x20); @@ -667,7 +667,7 @@ static void air_powered_vertical_rc_track_vertical_up(paint_session * session, u sub_98197C_rotated(direction, imageId, 0, 0, 2, 20, 79, height, 30, 6, height); } - paint_util_set_vertical_tunnel(height + 80); + paint_util_set_vertical_tunnel(session, height + 80); break; } @@ -721,7 +721,7 @@ static void air_powered_vertical_rc_track_vertical_top(paint_session * session, } else { sub_98197C_rotated(direction, imageIdT, 0, 0, 2, 20, 1, height, 33, 6, height); } - paint_util_set_vertical_tunnel(height + 80); + paint_util_set_vertical_tunnel(session, height + 80); break; case 2: imageIdT = imageIds[direction][3] | gTrackColours[SCHEME_TRACK]; @@ -730,7 +730,7 @@ static void air_powered_vertical_rc_track_vertical_top(paint_session * session, } else { sub_98197C_rotated(direction, imageIdT, 0, 0, 2, 20, 15, height, 0, 6, height); } - paint_util_set_vertical_tunnel(height + 80); + paint_util_set_vertical_tunnel(session, height + 80); break; case 3: imageIdS = imageIds[direction][4] | air_powered_vertical_rc_get_support_colour(); diff --git a/src/openrct2/ride/coaster/bobsleigh_coaster.c b/src/openrct2/ride/coaster/bobsleigh_coaster.c index 1cb179d113..302585e11c 100644 --- a/src/openrct2/ride/coaster/bobsleigh_coaster.c +++ b/src/openrct2/ride/coaster/bobsleigh_coaster.c @@ -62,7 +62,7 @@ static void bobsleigh_rc_track_flat(paint_session * session, uint8 rideIndex, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -80,7 +80,7 @@ static void bobsleigh_rc_track_station(paint_session * session, uint8 rideIndex, sub_98196C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -134,9 +134,9 @@ static void bobsleigh_rc_track_25_deg_up(paint_session * session, uint8 rideInde } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -191,9 +191,9 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -248,9 +248,9 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -299,7 +299,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -398,10 +398,10 @@ static void bobsleigh_rc_track_left_quarter_turn_5(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -441,7 +441,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -470,7 +470,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -499,7 +499,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -528,7 +528,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -558,7 +558,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -657,10 +657,10 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -701,9 +701,9 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -734,9 +734,9 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -767,9 +767,9 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -800,9 +800,9 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -856,7 +856,7 @@ static void bobsleigh_rc_track_left_bank(paint_session * session, uint8 rideInde if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -892,7 +892,7 @@ static void bobsleigh_rc_track_s_bend_left(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -967,10 +967,10 @@ static void bobsleigh_rc_track_s_bend_left(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1004,7 +1004,7 @@ static void bobsleigh_rc_track_s_bend_right(paint_session * session, uint8 rideI } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1079,10 +1079,10 @@ static void bobsleigh_rc_track_s_bend_right(paint_session * session, uint8 rideI metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1116,7 +1116,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1168,10 +1168,10 @@ static void bobsleigh_rc_track_left_quarter_turn_3(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1212,7 +1212,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1264,10 +1264,10 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1308,7 +1308,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1360,10 +1360,10 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1391,10 +1391,10 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1446,7 +1446,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1479,7 +1479,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1531,10 +1531,10 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1562,10 +1562,10 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1617,7 +1617,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1672,7 +1672,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1771,10 +1771,10 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1802,10 +1802,10 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1904,7 +1904,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1937,7 +1937,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2036,10 +2036,10 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2067,10 +2067,10 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2169,7 +2169,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2217,7 +2217,7 @@ static void bobsleigh_rc_track_brakes(paint_session * session, uint8 rideIndex, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -2240,7 +2240,7 @@ static void bobsleigh_rc_track_block_brakes(paint_session * session, uint8 rideI if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -2281,7 +2281,7 @@ static void bobsleigh_rc_track_on_ride_photo(paint_session * session, uint8 ride break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } diff --git a/src/openrct2/ride/coaster/bolliger_mabillard_track.c b/src/openrct2/ride/coaster/bolliger_mabillard_track.c index 0d8944a6d1..40848d127d 100644 --- a/src/openrct2/ride/coaster/bolliger_mabillard_track.c +++ b/src/openrct2/ride/coaster/bolliger_mabillard_track.c @@ -62,7 +62,7 @@ void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uin metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -87,7 +87,7 @@ void bolliger_mabillard_track_station(paint_session * session, uint8 rideIndex, rct_ride * ride = get_ride(rideIndex); track_paint_util_draw_station_platform(session, ride, direction, height, 9, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -132,9 +132,9 @@ void bolliger_mabillard_track_25_deg_up(paint_session * session, uint8 rideIndex } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -180,9 +180,9 @@ void bolliger_mabillard_track_60_deg_up(paint_session * session, uint8 rideIndex } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -228,9 +228,9 @@ void bolliger_mabillard_track_flat_to_25_deg_up(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -280,9 +280,9 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -332,9 +332,9 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -380,9 +380,9 @@ void bolliger_mabillard_track_25_deg_up_to_flat(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -438,7 +438,7 @@ void bolliger_mabillard_track_left_quarter_turn_5(paint_session * session, uint8 } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -521,10 +521,10 @@ void bolliger_mabillard_track_left_quarter_turn_5(paint_session * session, uint8 metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -560,7 +560,7 @@ void bolliger_mabillard_track_flat_to_left_bank(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -586,7 +586,7 @@ void bolliger_mabillard_track_flat_to_right_bank(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -612,7 +612,7 @@ void bolliger_mabillard_track_left_bank_to_flat(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -638,7 +638,7 @@ void bolliger_mabillard_track_right_bank_to_flat(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -666,7 +666,7 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -751,10 +751,10 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -791,9 +791,9 @@ void bolliger_mabillard_track_left_bank_to_25_deg_up(paint_session * session, ui metal_a_supports_paint_setup(session, supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -821,9 +821,9 @@ void bolliger_mabillard_track_right_bank_to_25_deg_up(paint_session * session, u metal_a_supports_paint_setup(session, supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -851,9 +851,9 @@ void bolliger_mabillard_track_25_deg_up_to_left_bank(paint_session * session, ui metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -881,9 +881,9 @@ void bolliger_mabillard_track_25_deg_up_to_right_bank(paint_session * session, u metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -928,7 +928,7 @@ void bolliger_mabillard_track_left_bank(paint_session * session, uint8 rideIndex if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -958,7 +958,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(paint_session * sess } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1041,10 +1041,10 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1073,7 +1073,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(paint_session * ses } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1156,10 +1156,10 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1200,7 +1200,7 @@ void bolliger_mabillard_track_s_bend_left(paint_session * session, uint8 rideInd } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1263,10 +1263,10 @@ void bolliger_mabillard_track_s_bend_left(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1295,7 +1295,7 @@ void bolliger_mabillard_track_s_bend_right(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1358,10 +1358,10 @@ void bolliger_mabillard_track_s_bend_right(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1393,7 +1393,7 @@ void bolliger_mabillard_track_left_vertical_loop(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -1541,10 +1541,10 @@ void bolliger_mabillard_track_left_vertical_loop(paint_session * session, uint8 } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1573,7 +1573,7 @@ void bolliger_mabillard_track_right_vertical_loop(paint_session * session, uint8 } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -1711,10 +1711,10 @@ void bolliger_mabillard_track_right_vertical_loop(paint_session * session, uint8 metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -1744,7 +1744,7 @@ void bolliger_mabillard_track_left_quarter_turn_3(paint_session * session, uint8 } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1788,10 +1788,10 @@ void bolliger_mabillard_track_left_quarter_turn_3(paint_session * session, uint8 metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1827,7 +1827,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(paint_session * session, } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1872,10 +1872,10 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(paint_session * session, metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1910,7 +1910,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(paint_session * sess } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1939,10 +1939,10 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1971,7 +1971,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(paint_session * ses } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2003,10 +2003,10 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2048,7 +2048,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, supportType, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2093,10 +2093,10 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2121,10 +2121,10 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, supportType, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2169,7 +2169,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2198,7 +2198,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, supportType, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2243,10 +2243,10 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2271,10 +2271,10 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, supportType, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2319,7 +2319,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2368,7 +2368,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, supportType, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2452,10 +2452,10 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, supportType, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2480,10 +2480,10 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, supportType, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2567,7 +2567,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, supportType, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2596,7 +2596,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, supportType, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2683,10 +2683,10 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * s } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2711,10 +2711,10 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, supportType, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2801,7 +2801,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2904,7 +2904,7 @@ void bolliger_mabillard_track_brakes(paint_session * session, uint8 rideIndex, u if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -2929,9 +2929,9 @@ void bolliger_mabillard_track_25_deg_up_left_banked(paint_session * session, uin metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2957,9 +2957,9 @@ void bolliger_mabillard_track_25_deg_up_right_banked(paint_session * session, ui metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2994,7 +2994,7 @@ void bolliger_mabillard_track_on_ride_photo(paint_session * session, uint8 rideI break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -3027,7 +3027,7 @@ void bolliger_mabillard_track_90_deg_up(paint_session * session, uint8 rideIndex sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17529, 0, 0, 2, 20, 31, height, 4, 6, height + 8); break; } - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -3060,9 +3060,9 @@ void bolliger_mabillard_track_60_deg_up_to_90_deg_up(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } - paint_util_set_vertical_tunnel(height + 56); + paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); break; @@ -3094,10 +3094,10 @@ void bolliger_mabillard_track_90_deg_up_to_60_deg_up(paint_session * session, ui } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 48, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_8); break; case 2: - paint_util_push_tunnel_left(height + 48, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3123,7 +3123,7 @@ void bolliger_mabillard_track_60_deg_down_to_90_deg_down(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 48, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 80, 0x20); @@ -3153,7 +3153,7 @@ void bolliger_mabillard_track_left_eighth_to_diag(paint_session * session, uint8 } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3243,7 +3243,7 @@ void bolliger_mabillard_track_right_eighth_to_diag(paint_session * session, uint } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3345,7 +3345,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3435,7 +3435,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5870,7 +5870,7 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_s } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -5899,10 +5899,10 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_s metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5932,7 +5932,7 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -5964,10 +5964,10 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5999,7 +5999,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -6029,10 +6029,10 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6061,7 +6061,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(pai } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -6091,10 +6091,10 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(pai metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6118,7 +6118,7 @@ void bolliger_mabillard_track_block_brakes(paint_session * session, uint8 rideIn if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -6143,7 +6143,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(paint_session } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -6172,10 +6172,10 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(paint_session metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6204,7 +6204,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(paint_sessio } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -6236,10 +6236,10 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(paint_sessio } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6280,7 +6280,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(paint_session } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -6363,10 +6363,10 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(paint_session metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6395,7 +6395,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(paint_sessio } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -6478,10 +6478,10 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(paint_sessio metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6523,9 +6523,9 @@ void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(paint_session * metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -6552,9 +6552,9 @@ void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(paint_session metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -6581,9 +6581,9 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(paint_session * metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -6610,9 +6610,9 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(paint_session metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -6658,9 +6658,9 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(paint_se metal_a_supports_paint_setup(session, supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6686,9 +6686,9 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(paint_ metal_a_supports_paint_setup(session, supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6714,9 +6714,9 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(paint_se metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6742,9 +6742,9 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(paint_ metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6791,9 +6791,9 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6820,9 +6820,9 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6849,9 +6849,9 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(paint_session * sess metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6878,9 +6878,9 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(paint_session * ses metal_a_supports_paint_setup(session, supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6926,7 +6926,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(paint_session * sess sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18009, 0, 0, 2, 20, 63, height, 24, 6, height + 8); break; } - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); break; @@ -6955,7 +6955,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(paint_session * ses sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18005, 0, 0, 2, 20, 63, height, 4, 6, height + 8); break; } - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); break; @@ -7015,9 +7015,9 @@ void bolliger_mabillard_track_flat_to_60_deg_up(paint_session * session, uint8 r metal_a_supports_paint_setup(session, supportType, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -7063,9 +7063,9 @@ void bolliger_mabillard_track_60_deg_up_to_flat(paint_session * session, uint8 r metal_a_supports_paint_setup(session, supportType, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -7101,9 +7101,9 @@ void bolliger_mabillard_track_brake_for_drop(paint_session * session, uint8 ride } metal_a_supports_paint_setup(session, supportType, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -7130,7 +7130,7 @@ void bolliger_mabillard_track_half_loop_up(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -7191,7 +7191,7 @@ void bolliger_mabillard_track_half_loop_up(paint_session * session, uint8 rideIn break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -7226,7 +7226,7 @@ void bolliger_mabillard_track_left_corkscrew_up(paint_session * session, uint8 r track_paint_util_left_corkscrew_up_supports(session, direction, height); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -7269,10 +7269,10 @@ void bolliger_mabillard_track_left_corkscrew_up(paint_session * session, uint8 r switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -7300,7 +7300,7 @@ void bolliger_mabillard_track_right_corkscrew_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -7344,10 +7344,10 @@ void bolliger_mabillard_track_right_corkscrew_up(paint_session * session, uint8 switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -7387,7 +7387,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(paint_session * sessio metal_a_supports_paint_setup(session, supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -7454,10 +7454,10 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(paint_session * sessio } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_8); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -7489,7 +7489,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(paint_session * sessio metal_a_supports_paint_setup(session, supportType, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 80, 0x20); @@ -7556,10 +7556,10 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(paint_session * sessio } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -7605,7 +7605,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -7653,10 +7653,10 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(paint_session * sessio } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -7692,7 +7692,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -7740,10 +7740,10 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(paint_session * sessi } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -7780,9 +7780,9 @@ void bolliger_mabillard_track_powered_lift(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -7808,7 +7808,7 @@ void bolliger_mabillard_track_left_large_half_loop_up(paint_session * session, u } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -7924,7 +7924,7 @@ void bolliger_mabillard_track_left_large_half_loop_up(paint_session * session, u break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -7952,7 +7952,7 @@ void bolliger_mabillard_track_right_large_half_loop_up(paint_session * session, } metal_a_supports_paint_setup(session, supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -8068,7 +8068,7 @@ void bolliger_mabillard_track_right_large_half_loop_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -8141,7 +8141,7 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(paint_sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -8175,7 +8175,7 @@ void bolliger_mabillard_track_booster(paint_session * session, uint8 rideIndex, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/compact_inverted_coaster.c b/src/openrct2/ride/coaster/compact_inverted_coaster.c index 1ac9f3b2d5..2681807450 100644 --- a/src/openrct2/ride/coaster/compact_inverted_coaster.c +++ b/src/openrct2/ride/coaster/compact_inverted_coaster.c @@ -58,7 +58,7 @@ static void compact_inverted_rc_track_flat(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -77,7 +77,7 @@ static void compact_inverted_rc_track_station(paint_session * session, uint8 rid sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6, height + 29); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 11); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_TALL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -136,9 +136,9 @@ static void compact_inverted_rc_track_25_deg_up(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -178,9 +178,9 @@ static void compact_inverted_rc_track_60_deg_up(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 120, 0x20); @@ -240,9 +240,9 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -286,9 +286,9 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(paint_session * ses } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 88, 0x20); @@ -352,9 +352,9 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_general_support_height(height + 88, 0x20); } @@ -413,9 +413,9 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -480,7 +480,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -565,10 +565,10 @@ static void compact_inverted_rc_track_left_quarter_turn_5(paint_session * sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -606,7 +606,7 @@ static void compact_inverted_rc_track_flat_to_left_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -633,7 +633,7 @@ static void compact_inverted_rc_track_flat_to_right_bank(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -660,7 +660,7 @@ static void compact_inverted_rc_track_left_bank_to_flat(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -687,7 +687,7 @@ static void compact_inverted_rc_track_right_bank_to_flat(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -715,7 +715,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -800,10 +800,10 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(paint_session * switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -855,9 +855,9 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -899,9 +899,9 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up(paint_session * se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -943,9 +943,9 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -987,9 +987,9 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank(paint_session * se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -1041,7 +1041,7 @@ static void compact_inverted_rc_track_left_bank(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -1075,7 +1075,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -1160,10 +1160,10 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -1195,7 +1195,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -1280,10 +1280,10 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_sessi switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -1329,7 +1329,7 @@ static void compact_inverted_rc_track_s_bend_left(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1410,10 +1410,10 @@ static void compact_inverted_rc_track_s_bend_left(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1445,7 +1445,7 @@ static void compact_inverted_rc_track_s_bend_right(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1526,10 +1526,10 @@ static void compact_inverted_rc_track_s_bend_right(paint_session * session, uint switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1574,7 +1574,7 @@ static void compact_inverted_rc_track_left_vertical_loop(paint_session * session } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -1726,10 +1726,10 @@ static void compact_inverted_rc_track_left_vertical_loop(paint_session * session switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_4); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_4); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_4); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_4); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -1774,7 +1774,7 @@ static void compact_inverted_rc_track_right_vertical_loop(paint_session * sessio } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -1926,10 +1926,10 @@ static void compact_inverted_rc_track_right_vertical_loop(paint_session * sessio switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_4); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_4); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_4); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_4); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -1961,7 +1961,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2007,10 +2007,10 @@ static void compact_inverted_rc_track_left_quarter_turn_3(paint_session * sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2049,7 +2049,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2095,10 +2095,10 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(paint_session * s switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2137,7 +2137,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -2168,10 +2168,10 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -2203,7 +2203,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -2234,10 +2234,10 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_sessi switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -2283,7 +2283,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2323,10 +2323,10 @@ static void compact_inverted_rc_track_left_twist_down_to_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2359,7 +2359,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2399,10 +2399,10 @@ static void compact_inverted_rc_track_right_twist_down_to_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2432,7 +2432,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2476,10 +2476,10 @@ static void compact_inverted_rc_track_left_twist_up_to_down(paint_session * sess switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2508,7 +2508,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2552,10 +2552,10 @@ static void compact_inverted_rc_track_right_twist_up_to_down(paint_session * ses switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2600,7 +2600,7 @@ static void compact_inverted_rc_track_half_loop_up(paint_session * session, uint } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -2656,7 +2656,7 @@ static void compact_inverted_rc_track_half_loop_up(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 32, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -2694,7 +2694,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 64, 0x20); break; @@ -2734,10 +2734,10 @@ static void compact_inverted_rc_track_left_corkscrew_up(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 28, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 40, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 40, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height + 40, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 40, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2770,7 +2770,7 @@ static void compact_inverted_rc_track_right_corkscrew_up(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 64, 0x20); break; @@ -2810,10 +2810,10 @@ static void compact_inverted_rc_track_right_corkscrew_up(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 28, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 40, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 40, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height + 40, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 40, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2917,7 +2917,7 @@ static void compact_inverted_rc_track_brakes(paint_session * session, uint8 ride metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -2945,7 +2945,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(paint_s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3030,10 +3030,10 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(paint_s switch (direction) { case 2: - paint_util_push_tunnel_right(height + 16, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height + 16, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3065,7 +3065,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(paint_ metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3150,10 +3150,10 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(paint_ switch (direction) { case 0: - paint_util_push_tunnel_right(height + 16, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height + 16, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3185,7 +3185,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(paint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3270,10 +3270,10 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(paint switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3305,7 +3305,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(pain metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3390,10 +3390,10 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(pain switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3431,7 +3431,7 @@ static void compact_inverted_rc_track_on_ride_photo(paint_session * session, uin break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); } @@ -3472,7 +3472,7 @@ static void compact_inverted_rc_track_90_deg_up(paint_session * session, uint8 r break; } } - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -3524,9 +3524,9 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(paint_session * ses } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } - paint_util_set_vertical_tunnel(height + 56); + paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); break; @@ -3577,10 +3577,10 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(paint_session * ses } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 48, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_5); break; case 2: - paint_util_push_tunnel_left(height + 48, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_5); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3624,7 +3624,7 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(paint_session * } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 48, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); @@ -3658,7 +3658,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3763,7 +3763,7 @@ static void compact_inverted_rc_track_right_eighth_to_diag(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3882,7 +3882,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3987,7 +3987,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5909,7 +5909,7 @@ static void compact_inverted_rc_track_block_brakes(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } diff --git a/src/openrct2/ride/coaster/corkscrew_roller_coaster.c b/src/openrct2/ride/coaster/corkscrew_roller_coaster.c index 2be373e145..bab443c851 100644 --- a/src/openrct2/ride/coaster/corkscrew_roller_coaster.c +++ b/src/openrct2/ride/coaster/corkscrew_roller_coaster.c @@ -62,7 +62,7 @@ static void corkscrew_rc_track_flat(paint_session * session, uint8 rideIndex, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -85,7 +85,7 @@ static void corkscrew_rc_track_station(paint_session * session, uint8 rideIndex, sub_98196C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -131,9 +131,9 @@ static void corkscrew_rc_track_25_deg_up(paint_session * session, uint8 rideInde } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -180,9 +180,9 @@ static void corkscrew_rc_track_60_deg_up(paint_session * session, uint8 rideInde } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -229,9 +229,9 @@ static void corkscrew_rc_track_flat_to_25_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -282,9 +282,9 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(paint_session * session, u } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -335,9 +335,9 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(paint_session * session, u } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -384,9 +384,9 @@ static void corkscrew_rc_track_25_deg_up_to_flat(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -449,7 +449,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -532,10 +532,10 @@ static void corkscrew_rc_track_left_quarter_turn_5(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -573,7 +573,7 @@ static void corkscrew_rc_track_flat_to_left_bank(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -600,7 +600,7 @@ static void corkscrew_rc_track_flat_to_right_bank(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -627,7 +627,7 @@ static void corkscrew_rc_track_left_bank_to_flat(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -654,7 +654,7 @@ static void corkscrew_rc_track_right_bank_to_flat(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -681,7 +681,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -765,10 +765,10 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -807,9 +807,9 @@ static void corkscrew_rc_track_left_bank_to_25_deg_up(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -838,9 +838,9 @@ static void corkscrew_rc_track_right_bank_to_25_deg_up(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -869,9 +869,9 @@ static void corkscrew_rc_track_25_deg_up_to_left_bank(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -900,9 +900,9 @@ static void corkscrew_rc_track_25_deg_up_to_right_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -952,7 +952,7 @@ static void corkscrew_rc_track_left_bank(paint_session * session, uint8 rideInde if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -984,7 +984,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1067,10 +1067,10 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1100,7 +1100,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1183,10 +1183,10 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1230,7 +1230,7 @@ static void corkscrew_rc_track_s_bend_left(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1293,10 +1293,10 @@ static void corkscrew_rc_track_s_bend_left(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1326,7 +1326,7 @@ static void corkscrew_rc_track_s_bend_right(paint_session * session, uint8 rideI } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1389,10 +1389,10 @@ static void corkscrew_rc_track_s_bend_right(paint_session * session, uint8 rideI metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1425,7 +1425,7 @@ static void corkscrew_rc_track_left_vertical_loop(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -1573,10 +1573,10 @@ static void corkscrew_rc_track_left_vertical_loop(paint_session * session, uint8 } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1606,7 +1606,7 @@ static void corkscrew_rc_track_right_vertical_loop(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -1744,10 +1744,10 @@ static void corkscrew_rc_track_right_vertical_loop(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -1778,7 +1778,7 @@ static void corkscrew_rc_track_left_quarter_turn_3(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1822,10 +1822,10 @@ static void corkscrew_rc_track_left_quarter_turn_3(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1863,7 +1863,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1908,10 +1908,10 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1948,7 +1948,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1977,10 +1977,10 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2010,7 +2010,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2042,10 +2042,10 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(paint_session * se } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2089,7 +2089,7 @@ static void corkscrew_rc_track_half_loop_up(paint_session * session, uint8 rideI } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2150,7 +2150,7 @@ static void corkscrew_rc_track_half_loop_up(paint_session * session, uint8 rideI break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2187,7 +2187,7 @@ static void corkscrew_rc_track_left_corkscrew_up(paint_session * session, uint8 track_paint_util_left_corkscrew_up_supports(session, direction, height); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2230,10 +2230,10 @@ static void corkscrew_rc_track_left_corkscrew_up(paint_session * session, uint8 switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2262,7 +2262,7 @@ static void corkscrew_rc_track_right_corkscrew_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2306,10 +2306,10 @@ static void corkscrew_rc_track_right_corkscrew_up(paint_session * session, uint8 switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2351,7 +2351,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2396,10 +2396,10 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2424,10 +2424,10 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2472,7 +2472,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2502,7 +2502,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2547,10 +2547,10 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2575,10 +2575,10 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2623,7 +2623,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2675,7 +2675,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2759,10 +2759,10 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2787,10 +2787,10 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2874,7 +2874,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2904,7 +2904,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2988,10 +2988,10 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3016,10 +3016,10 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3103,7 +3103,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3213,7 +3213,7 @@ static void corkscrew_rc_track_brakes(paint_session * session, uint8 rideIndex, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -3248,7 +3248,7 @@ static void corkscrew_rc_track_on_ride_photo(paint_session * session, uint8 ride break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -3276,7 +3276,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -3343,10 +3343,10 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(paint_session * sessi } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_8); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3378,7 +3378,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 80, 0x20); @@ -3445,10 +3445,10 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(paint_session * sessi } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3490,7 +3490,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3581,7 +3581,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(paint_session * session, uin } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3686,7 +3686,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3777,7 +3777,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5858,7 +5858,7 @@ static void corkscrew_rc_track_block_brakes(paint_session * session, uint8 rideI break; } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -5891,7 +5891,7 @@ static void corkscrew_rc_track_booster(paint_session * session, uint8 rideIndex, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/flying_roller_coaster.c b/src/openrct2/ride/coaster/flying_roller_coaster.c index d1408f7b00..53bd299b0f 100644 --- a/src/openrct2/ride/coaster/flying_roller_coaster.c +++ b/src/openrct2/ride/coaster/flying_roller_coaster.c @@ -63,7 +63,7 @@ static void flying_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -96,7 +96,7 @@ static void flying_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -134,7 +134,7 @@ static void flying_rc_track_station(paint_session * session, uint8 rideIndex, ui track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -161,9 +161,9 @@ static void flying_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -219,9 +219,9 @@ static void flying_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -249,9 +249,9 @@ static void flying_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -271,9 +271,9 @@ static void flying_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -302,9 +302,9 @@ static void flying_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rid metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -360,9 +360,9 @@ static void flying_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rid } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -392,9 +392,9 @@ static void flying_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -416,9 +416,9 @@ static void flying_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -449,9 +449,9 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -492,9 +492,9 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -522,9 +522,9 @@ static void flying_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rid metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -580,9 +580,9 @@ static void flying_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rid } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -646,7 +646,7 @@ static void flying_rc_track_left_quarter_turn_5(paint_session * session, uint8 r } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -729,10 +729,10 @@ static void flying_rc_track_left_quarter_turn_5(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -761,7 +761,7 @@ static void flying_rc_track_left_quarter_turn_5(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -846,10 +846,10 @@ static void flying_rc_track_left_quarter_turn_5(paint_session * session, uint8 r switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -888,7 +888,7 @@ static void flying_rc_track_flat_to_left_bank(paint_session * session, uint8 rid if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -912,7 +912,7 @@ static void flying_rc_track_flat_to_left_bank(paint_session * session, uint8 rid metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -940,7 +940,7 @@ static void flying_rc_track_flat_to_right_bank(paint_session * session, uint8 ri if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -964,7 +964,7 @@ static void flying_rc_track_flat_to_right_bank(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -992,7 +992,7 @@ static void flying_rc_track_left_bank_to_flat(paint_session * session, uint8 rid if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1016,7 +1016,7 @@ static void flying_rc_track_left_bank_to_flat(paint_session * session, uint8 rid metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1044,7 +1044,7 @@ static void flying_rc_track_right_bank_to_flat(paint_session * session, uint8 ri if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1068,7 +1068,7 @@ static void flying_rc_track_right_bank_to_flat(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1096,7 +1096,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1180,10 +1180,10 @@ static void flying_rc_track_banked_left_quarter_turn_5(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1212,7 +1212,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -1297,10 +1297,10 @@ static void flying_rc_track_banked_left_quarter_turn_5(paint_session * session, switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -1340,9 +1340,9 @@ static void flying_rc_track_left_bank_to_25_deg_up(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1381,9 +1381,9 @@ static void flying_rc_track_left_bank_to_25_deg_up(paint_session * session, uint } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -1413,9 +1413,9 @@ static void flying_rc_track_right_bank_to_25_deg_up(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1454,9 +1454,9 @@ static void flying_rc_track_right_bank_to_25_deg_up(paint_session * session, uin } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -1486,9 +1486,9 @@ static void flying_rc_track_25_deg_up_to_left_bank(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1527,9 +1527,9 @@ static void flying_rc_track_25_deg_up_to_left_bank(paint_session * session, uint } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -1559,9 +1559,9 @@ static void flying_rc_track_25_deg_up_to_right_bank(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1600,9 +1600,9 @@ static void flying_rc_track_25_deg_up_to_right_bank(paint_session * session, uin } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -1653,7 +1653,7 @@ static void flying_rc_track_left_bank(paint_session * session, uint8 rideIndex, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1677,7 +1677,7 @@ static void flying_rc_track_left_bank(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1710,7 +1710,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1793,10 +1793,10 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1825,7 +1825,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -1910,10 +1910,10 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -1944,7 +1944,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2027,10 +2027,10 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2059,7 +2059,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -2144,10 +2144,10 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -2192,7 +2192,7 @@ static void flying_rc_track_s_bend_left(paint_session * session, uint8 rideIndex } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2255,10 +2255,10 @@ static void flying_rc_track_s_bend_left(paint_session * session, uint8 rideIndex metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2287,7 +2287,7 @@ static void flying_rc_track_s_bend_left(paint_session * session, uint8 rideIndex metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2368,10 +2368,10 @@ static void flying_rc_track_s_bend_left(paint_session * session, uint8 rideIndex switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2402,7 +2402,7 @@ static void flying_rc_track_s_bend_right(paint_session * session, uint8 rideInde } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2465,10 +2465,10 @@ static void flying_rc_track_s_bend_right(paint_session * session, uint8 rideInde metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2497,7 +2497,7 @@ static void flying_rc_track_s_bend_right(paint_session * session, uint8 rideInde metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2578,10 +2578,10 @@ static void flying_rc_track_s_bend_right(paint_session * session, uint8 rideInde switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2612,7 +2612,7 @@ static void flying_rc_track_left_quarter_turn_3(paint_session * session, uint8 r } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2656,10 +2656,10 @@ static void flying_rc_track_left_quarter_turn_3(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2688,7 +2688,7 @@ static void flying_rc_track_left_quarter_turn_3(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2734,10 +2734,10 @@ static void flying_rc_track_left_quarter_turn_3(paint_session * session, uint8 r switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2776,7 +2776,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(paint_session * session, ui } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2821,10 +2821,10 @@ static void flying_rc_track_left_quarter_turn_3_bank(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2853,7 +2853,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2899,10 +2899,10 @@ static void flying_rc_track_left_quarter_turn_3_bank(paint_session * session, ui switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2940,7 +2940,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2969,10 +2969,10 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3001,7 +3001,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -3032,10 +3032,10 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -3066,7 +3066,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -3098,10 +3098,10 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3130,7 +3130,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -3161,10 +3161,10 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -3210,7 +3210,7 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3255,10 +3255,10 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3283,10 +3283,10 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3331,7 +3331,7 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3357,7 +3357,7 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3402,10 +3402,10 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3430,10 +3430,10 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3478,7 +3478,7 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3510,7 +3510,7 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3555,10 +3555,10 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3583,10 +3583,10 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3631,7 +3631,7 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3657,7 +3657,7 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3702,10 +3702,10 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3730,10 +3730,10 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3778,7 +3778,7 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3832,7 +3832,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3916,10 +3916,10 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3944,10 +3944,10 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4031,7 +4031,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4057,7 +4057,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4141,10 +4141,10 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4169,10 +4169,10 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4256,7 +4256,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4288,7 +4288,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4372,10 +4372,10 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4400,10 +4400,10 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4487,7 +4487,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4513,7 +4513,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4597,10 +4597,10 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4625,10 +4625,10 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4712,7 +4712,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4867,7 +4867,7 @@ static void flying_rc_track_brakes(paint_session * session, uint8 rideIndex, uin if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -4887,7 +4887,7 @@ static void flying_rc_track_brakes(paint_session * session, uint8 rideIndex, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -4917,7 +4917,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5002,10 +5002,10 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(paint_session * s switch (direction) { case 2: - paint_util_push_tunnel_right(height + 16, TUNNEL_9); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_9); break; case 3: - paint_util_push_tunnel_left(height + 16, TUNNEL_9); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5033,7 +5033,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5118,10 +5118,10 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(paint_session * s switch (direction) { case 2: - paint_util_push_tunnel_right(height + 16, TUNNEL_9); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_9); break; case 3: - paint_util_push_tunnel_left(height + 16, TUNNEL_9); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5155,7 +5155,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5240,10 +5240,10 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(paint_session * switch (direction) { case 0: - paint_util_push_tunnel_right(height + 16, TUNNEL_9); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_9); break; case 1: - paint_util_push_tunnel_left(height + 16, TUNNEL_9); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5271,7 +5271,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5356,10 +5356,10 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(paint_session * switch (direction) { case 0: - paint_util_push_tunnel_right(height + 16, TUNNEL_9); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_9); break; case 1: - paint_util_push_tunnel_left(height + 16, TUNNEL_9); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5393,7 +5393,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5478,10 +5478,10 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(paint_session * switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5509,7 +5509,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5594,10 +5594,10 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(paint_session * switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5631,7 +5631,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5716,10 +5716,10 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(paint_session switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5747,7 +5747,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5832,10 +5832,10 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(paint_session switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -5866,9 +5866,9 @@ static void flying_rc_track_25_deg_up_left_banked(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5907,9 +5907,9 @@ static void flying_rc_track_25_deg_up_left_banked(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -5937,9 +5937,9 @@ static void flying_rc_track_25_deg_up_right_banked(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5978,9 +5978,9 @@ static void flying_rc_track_25_deg_up_right_banked(paint_session * session, uint } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -6017,7 +6017,7 @@ static void flying_rc_track_on_ride_photo(paint_session * session, uint8 rideInd break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } else { @@ -6048,7 +6048,7 @@ static void flying_rc_track_on_ride_photo(paint_session * session, uint8 rideInd break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); } @@ -6088,7 +6088,7 @@ static void flying_rc_track_left_eighth_to_diag(paint_session * session, uint8 r } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -6178,7 +6178,7 @@ static void flying_rc_track_left_eighth_to_diag(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -6282,7 +6282,7 @@ static void flying_rc_track_right_eighth_to_diag(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -6372,7 +6372,7 @@ static void flying_rc_track_right_eighth_to_diag(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -6490,7 +6490,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(paint_session * session, ui } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -6580,7 +6580,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -6684,7 +6684,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(paint_session * session, u } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -6774,7 +6774,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10527,7 +10527,7 @@ static void flying_rc_track_left_flyer_twist_up(paint_session * session, uint8 r } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10571,10 +10571,10 @@ static void flying_rc_track_left_flyer_twist_up(paint_session * session, uint8 r switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10599,7 +10599,7 @@ static void flying_rc_track_left_flyer_twist_up(paint_session * session, uint8 r } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10643,10 +10643,10 @@ static void flying_rc_track_left_flyer_twist_up(paint_session * session, uint8 r switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10677,7 +10677,7 @@ static void flying_rc_track_right_flyer_twist_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10721,10 +10721,10 @@ static void flying_rc_track_right_flyer_twist_up(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10749,7 +10749,7 @@ static void flying_rc_track_right_flyer_twist_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10793,10 +10793,10 @@ static void flying_rc_track_right_flyer_twist_up(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10830,7 +10830,7 @@ static void flying_rc_track_left_flyer_twist_down(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10870,10 +10870,10 @@ static void flying_rc_track_left_flyer_twist_down(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -10902,7 +10902,7 @@ static void flying_rc_track_left_flyer_twist_down(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10942,10 +10942,10 @@ static void flying_rc_track_left_flyer_twist_down(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -10980,7 +10980,7 @@ static void flying_rc_track_right_flyer_twist_down(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -11020,10 +11020,10 @@ static void flying_rc_track_right_flyer_twist_down(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -11052,7 +11052,7 @@ static void flying_rc_track_right_flyer_twist_down(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -11092,10 +11092,10 @@ static void flying_rc_track_right_flyer_twist_down(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height - 5, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -11127,7 +11127,7 @@ static void flying_rc_track_flyer_half_loop_up(paint_session * session, uint8 ri } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -11188,7 +11188,7 @@ static void flying_rc_track_flyer_half_loop_up(paint_session * session, uint8 ri break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11213,7 +11213,7 @@ static void flying_rc_track_flyer_half_loop_up(paint_session * session, uint8 ri } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -11274,7 +11274,7 @@ static void flying_rc_track_flyer_half_loop_up(paint_session * session, uint8 ri break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11304,7 +11304,7 @@ static void flying_rc_track_flyer_half_loop_down(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11366,7 +11366,7 @@ static void flying_rc_track_flyer_half_loop_down(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -11390,7 +11390,7 @@ static void flying_rc_track_flyer_half_loop_down(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11452,7 +11452,7 @@ static void flying_rc_track_flyer_half_loop_down(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -11476,7 +11476,7 @@ static void flying_rc_track_block_brakes(paint_session * session, uint8 rideInde break; } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -11496,7 +11496,7 @@ static void flying_rc_track_block_brakes(paint_session * session, uint8 rideInde metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -11523,7 +11523,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -11552,10 +11552,10 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -11584,7 +11584,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -11615,10 +11615,10 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -11649,7 +11649,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -11681,10 +11681,10 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -11713,7 +11713,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -11744,10 +11744,10 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -11792,7 +11792,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -11875,10 +11875,10 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -11907,7 +11907,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -11992,10 +11992,10 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -12026,7 +12026,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -12109,10 +12109,10 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -12141,7 +12141,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -12226,10 +12226,10 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -12275,9 +12275,9 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -12316,9 +12316,9 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * s } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -12347,9 +12347,9 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -12388,9 +12388,9 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -12419,9 +12419,9 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -12460,9 +12460,9 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * s } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -12491,9 +12491,9 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -12532,9 +12532,9 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -12586,9 +12586,9 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -12627,9 +12627,9 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -12657,9 +12657,9 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -12698,9 +12698,9 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -12728,9 +12728,9 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -12769,9 +12769,9 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -12799,9 +12799,9 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -12840,9 +12840,9 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -12895,9 +12895,9 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -12936,9 +12936,9 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -12967,9 +12967,9 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -13008,9 +13008,9 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -13039,9 +13039,9 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -13080,9 +13080,9 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -13111,9 +13111,9 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -13152,9 +13152,9 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 56, 0x20); } diff --git a/src/openrct2/ride/coaster/giga_coaster.c b/src/openrct2/ride/coaster/giga_coaster.c index d4eaf0af40..b6fbfbf21a 100644 --- a/src/openrct2/ride/coaster/giga_coaster.c +++ b/src/openrct2/ride/coaster/giga_coaster.c @@ -76,7 +76,7 @@ static void giga_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 t metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -98,7 +98,7 @@ static void giga_rc_track_station(paint_session * session, uint8 rideIndex, uint sub_98196C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -162,9 +162,9 @@ static void giga_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -211,9 +211,9 @@ static void giga_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -278,9 +278,9 @@ static void giga_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideI } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -331,9 +331,9 @@ static void giga_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -384,9 +384,9 @@ static void giga_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -451,9 +451,9 @@ static void giga_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideI } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -516,7 +516,7 @@ static void giga_rc_track_left_quarter_turn_5(paint_session * session, uint8 rid } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -599,10 +599,10 @@ static void giga_rc_track_left_quarter_turn_5(paint_session * session, uint8 rid metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -640,7 +640,7 @@ static void giga_rc_track_flat_to_left_bank(paint_session * session, uint8 rideI if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -667,7 +667,7 @@ static void giga_rc_track_flat_to_right_bank(paint_session * session, uint8 ride if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -694,7 +694,7 @@ static void giga_rc_track_left_bank_to_flat(paint_session * session, uint8 rideI if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -721,7 +721,7 @@ static void giga_rc_track_right_bank_to_flat(paint_session * session, uint8 ride if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -748,7 +748,7 @@ static void giga_rc_track_banked_left_quarter_turn_5(paint_session * session, ui } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -832,10 +832,10 @@ static void giga_rc_track_banked_left_quarter_turn_5(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -874,9 +874,9 @@ static void giga_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -905,9 +905,9 @@ static void giga_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -936,9 +936,9 @@ static void giga_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -967,9 +967,9 @@ static void giga_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1019,7 +1019,7 @@ static void giga_rc_track_left_bank(paint_session * session, uint8 rideIndex, ui if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -1051,7 +1051,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1134,10 +1134,10 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1167,7 +1167,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1250,10 +1250,10 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1297,7 +1297,7 @@ static void giga_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1360,10 +1360,10 @@ static void giga_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1393,7 +1393,7 @@ static void giga_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1456,10 +1456,10 @@ static void giga_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1489,7 +1489,7 @@ static void giga_rc_track_left_quarter_turn_3(paint_session * session, uint8 rid } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1533,10 +1533,10 @@ static void giga_rc_track_left_quarter_turn_3(paint_session * session, uint8 rid metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1574,7 +1574,7 @@ static void giga_rc_track_left_quarter_turn_3_bank(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1619,10 +1619,10 @@ static void giga_rc_track_left_quarter_turn_3_bank(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1659,7 +1659,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1688,10 +1688,10 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1721,7 +1721,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1753,10 +1753,10 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1801,7 +1801,7 @@ static void giga_rc_track_left_half_banked_helix_up_small(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1846,10 +1846,10 @@ static void giga_rc_track_left_half_banked_helix_up_small(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1874,10 +1874,10 @@ static void giga_rc_track_left_half_banked_helix_up_small(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1922,7 +1922,7 @@ static void giga_rc_track_left_half_banked_helix_up_small(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1952,7 +1952,7 @@ static void giga_rc_track_right_half_banked_helix_up_small(paint_session * sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1997,10 +1997,10 @@ static void giga_rc_track_right_half_banked_helix_up_small(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2025,10 +2025,10 @@ static void giga_rc_track_right_half_banked_helix_up_small(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2073,7 +2073,7 @@ static void giga_rc_track_right_half_banked_helix_up_small(paint_session * sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2125,7 +2125,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2209,10 +2209,10 @@ static void giga_rc_track_left_half_banked_helix_up_large(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2237,10 +2237,10 @@ static void giga_rc_track_left_half_banked_helix_up_large(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2324,7 +2324,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2354,7 +2354,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(paint_session * sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2441,10 +2441,10 @@ static void giga_rc_track_right_half_banked_helix_up_large(paint_session * sessi } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2469,10 +2469,10 @@ static void giga_rc_track_right_half_banked_helix_up_large(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2559,7 +2559,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2671,7 +2671,7 @@ static void giga_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -2697,9 +2697,9 @@ static void giga_rc_track_25_deg_up_left_banked(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2726,9 +2726,9 @@ static void giga_rc_track_25_deg_up_right_banked(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2764,7 +2764,7 @@ static void giga_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -2824,7 +2824,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(paint_session * session, u } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2951,10 +2951,10 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(paint_session * session, u } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_8); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2986,7 +2986,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 80, 0x20); @@ -3053,10 +3053,10 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(paint_session * session, u } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3100,9 +3100,9 @@ static void giga_rc_track_cable_lift_hill(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -3126,9 +3126,9 @@ static void giga_rc_track_cable_lift_hill(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -3154,9 +3154,9 @@ static void giga_rc_track_cable_lift_hill(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -3180,9 +3180,9 @@ static void giga_rc_track_cable_lift_hill(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -3211,7 +3211,7 @@ static void giga_rc_track_left_eighth_to_diag(paint_session * session, uint8 rid } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3302,7 +3302,7 @@ static void giga_rc_track_right_eighth_to_diag(paint_session * session, uint8 ri } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3407,7 +3407,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3498,7 +3498,7 @@ static void giga_rc_track_right_eighth_bank_to_diag(paint_session * session, uin } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5331,7 +5331,7 @@ static void giga_rc_track_block_brakes(paint_session * session, uint8 rideIndex, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -5357,7 +5357,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5386,10 +5386,10 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5419,7 +5419,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5451,10 +5451,10 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5498,7 +5498,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5581,10 +5581,10 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5614,7 +5614,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5697,10 +5697,10 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5745,9 +5745,9 @@ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5775,9 +5775,9 @@ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5805,9 +5805,9 @@ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5835,9 +5835,9 @@ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5888,9 +5888,9 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -5917,9 +5917,9 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -5946,9 +5946,9 @@ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -5975,9 +5975,9 @@ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6029,9 +6029,9 @@ static void giga_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6059,9 +6059,9 @@ static void giga_rc_track_flat_to_right_banked_25_deg_up(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6089,9 +6089,9 @@ static void giga_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6119,9 +6119,9 @@ static void giga_rc_track_right_banked_25_deg_up_to_flat(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6173,7 +6173,7 @@ static void giga_rc_track_booster(paint_session * session, uint8 rideIndex, uint if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/heartline_twister_coaster.c b/src/openrct2/ride/coaster/heartline_twister_coaster.c index cbdb4fe5e0..a5fcd84a1b 100644 --- a/src/openrct2/ride/coaster/heartline_twister_coaster.c +++ b/src/openrct2/ride/coaster/heartline_twister_coaster.c @@ -68,7 +68,7 @@ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideI break; } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -86,7 +86,7 @@ static void heartline_twister_rc_track_station(paint_session * session, uint8 ri sub_98196C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -142,9 +142,9 @@ static void heartline_twister_rc_track_25_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -201,9 +201,9 @@ static void heartline_twister_rc_track_60_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -260,9 +260,9 @@ static void heartline_twister_rc_track_flat_to_25_deg_up(paint_session * session } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -319,9 +319,9 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(paint_session * se } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -378,9 +378,9 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(paint_session * se } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -437,9 +437,9 @@ static void heartline_twister_rc_track_25_deg_up_to_flat(paint_session * session } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -509,9 +509,9 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -596,9 +596,9 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height - 16, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 16, TUNNEL_0); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -630,9 +630,9 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height - 16, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 16, TUNNEL_0); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -721,9 +721,9 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -758,7 +758,7 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -889,7 +889,7 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -923,7 +923,7 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -1054,7 +1054,7 @@ static void heartline_twister_rc_track_right_heartline_roll(paint_session * sess wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; diff --git a/src/openrct2/ride/coaster/inverted_hairpin_coaster.c b/src/openrct2/ride/coaster/inverted_hairpin_coaster.c index f5e2598866..f3ac819b8d 100644 --- a/src/openrct2/ride/coaster/inverted_hairpin_coaster.c +++ b/src/openrct2/ride/coaster/inverted_hairpin_coaster.c @@ -62,7 +62,7 @@ static void inverted_hairpin_rc_track_flat(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -81,7 +81,7 @@ static void inverted_hairpin_rc_track_station(paint_session * session, uint8 rid sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 6, height + 24); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 11); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_1); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -140,9 +140,9 @@ static void inverted_hairpin_rc_track_25_deg_up(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -182,9 +182,9 @@ static void inverted_hairpin_rc_track_60_deg_up(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -244,9 +244,9 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -290,9 +290,9 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(paint_session * ses } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -356,9 +356,9 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -417,9 +417,9 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -484,7 +484,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -530,10 +530,10 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(paint_session * sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -572,7 +572,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -603,10 +603,10 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(paint_sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -638,7 +638,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -669,10 +669,10 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(paint_sessi switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -717,14 +717,14 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1(paint_session * sessio switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_right(height, TUNNEL_0); - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -775,9 +775,9 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(paint_session * session, } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -839,9 +839,9 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -877,7 +877,7 @@ static void inverted_hairpin_rc_track_brakes(paint_session * session, uint8 ride metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -900,7 +900,7 @@ static void inverted_hairpin_rc_track_block_brakes(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/inverted_impulse_coaster.c b/src/openrct2/ride/coaster/inverted_impulse_coaster.c index 8280d7d415..b16cf6607b 100644 --- a/src/openrct2/ride/coaster/inverted_impulse_coaster.c +++ b/src/openrct2/ride/coaster/inverted_impulse_coaster.c @@ -45,7 +45,7 @@ static void inverted_impulse_rc_track_flat(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -64,7 +64,7 @@ static void inverted_impulse_rc_track_station(paint_session * session, uint8 rid sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6, height + 29); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 11); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_TALL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -106,9 +106,9 @@ static void inverted_impulse_rc_track_25_deg_up(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -131,9 +131,9 @@ static void inverted_impulse_rc_track_60_deg_up(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 120, 0x20); @@ -174,9 +174,9 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -201,9 +201,9 @@ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 88, 0x20); @@ -229,9 +229,9 @@ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 88, 0x20); @@ -272,9 +272,9 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -334,7 +334,7 @@ static void inverted_impulse_rc_track_90_deg_up(paint_session * session, uint8 r sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19703, 0, 0, 32, 20, 3, height + 29, 0, 6, height + 61); break; } - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -369,9 +369,9 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } - paint_util_set_vertical_tunnel(height + 56); + paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); break; @@ -405,10 +405,10 @@ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(paint_session * ses } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 48, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_5); break; case 2: - paint_util_push_tunnel_left(height + 48, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_5); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -435,7 +435,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 48, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); @@ -467,7 +467,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(paint_sessio sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19719, 0, 0, 32, 2, 31, height + 29, 0, 4, height + 11); break; } - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); break; @@ -498,7 +498,7 @@ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(paint_sessi sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19707, 0, 0, 32, 20, 3, height + 29, 0, 6, height + 125); break; } - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); break; diff --git a/src/openrct2/ride/coaster/inverted_roller_coaster.c b/src/openrct2/ride/coaster/inverted_roller_coaster.c index 72b918909b..596cf1448d 100644 --- a/src/openrct2/ride/coaster/inverted_roller_coaster.c +++ b/src/openrct2/ride/coaster/inverted_roller_coaster.c @@ -58,7 +58,7 @@ static void inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -77,7 +77,7 @@ static void inverted_rc_track_station(paint_session * session, uint8 rideIndex, sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6, height + 29); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 3); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_TALL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -136,9 +136,9 @@ static void inverted_rc_track_25_deg_up(paint_session * session, uint8 rideIndex } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -161,9 +161,9 @@ static void inverted_rc_track_60_deg_up(paint_session * session, uint8 rideIndex break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 120, 0x20); @@ -223,9 +223,9 @@ static void inverted_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -250,9 +250,9 @@ static void inverted_rc_track_25_deg_up_to_60_deg_up(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 88, 0x20); @@ -297,9 +297,9 @@ static void inverted_rc_track_60_deg_up_to_25_deg_up(paint_session * session, ui } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_general_support_height(height + 88, 0x20); } @@ -358,9 +358,9 @@ static void inverted_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -425,7 +425,7 @@ static void inverted_rc_track_left_quarter_turn_5(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -510,10 +510,10 @@ static void inverted_rc_track_left_quarter_turn_5(paint_session * session, uint8 switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -551,7 +551,7 @@ static void inverted_rc_track_flat_to_left_bank(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -578,7 +578,7 @@ static void inverted_rc_track_flat_to_right_bank(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -605,7 +605,7 @@ static void inverted_rc_track_left_bank_to_flat(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -632,7 +632,7 @@ static void inverted_rc_track_right_bank_to_flat(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -660,7 +660,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -745,10 +745,10 @@ static void inverted_rc_track_banked_left_quarter_turn_5(paint_session * session switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -800,9 +800,9 @@ static void inverted_rc_track_left_bank_to_25_deg_up(paint_session * session, ui } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -844,9 +844,9 @@ static void inverted_rc_track_right_bank_to_25_deg_up(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -888,9 +888,9 @@ static void inverted_rc_track_25_deg_up_to_left_bank(paint_session * session, ui } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -932,9 +932,9 @@ static void inverted_rc_track_25_deg_up_to_right_bank(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -986,7 +986,7 @@ static void inverted_rc_track_left_bank(paint_session * session, uint8 rideIndex metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -1020,7 +1020,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -1105,10 +1105,10 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -1140,7 +1140,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -1225,10 +1225,10 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -1274,7 +1274,7 @@ static void inverted_rc_track_s_bend_left(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1355,10 +1355,10 @@ static void inverted_rc_track_s_bend_left(paint_session * session, uint8 rideInd switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1390,7 +1390,7 @@ static void inverted_rc_track_s_bend_right(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1471,10 +1471,10 @@ static void inverted_rc_track_s_bend_right(paint_session * session, uint8 rideIn switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1519,7 +1519,7 @@ static void inverted_rc_track_left_vertical_loop(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -1671,10 +1671,10 @@ static void inverted_rc_track_left_vertical_loop(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_4); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_4); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_4); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_4); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -1719,7 +1719,7 @@ static void inverted_rc_track_right_vertical_loop(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -1871,10 +1871,10 @@ static void inverted_rc_track_right_vertical_loop(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_4); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_4); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_4); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_4); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -1906,7 +1906,7 @@ static void inverted_rc_track_left_quarter_turn_3(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1952,10 +1952,10 @@ static void inverted_rc_track_left_quarter_turn_3(paint_session * session, uint8 switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1994,7 +1994,7 @@ static void inverted_rc_track_left_quarter_turn_3_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2040,10 +2040,10 @@ static void inverted_rc_track_left_quarter_turn_3_bank(paint_session * session, switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2082,7 +2082,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -2113,10 +2113,10 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -2148,7 +2148,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -2179,10 +2179,10 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -2228,7 +2228,7 @@ static void inverted_rc_track_left_twist_down_to_up(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2268,10 +2268,10 @@ static void inverted_rc_track_left_twist_down_to_up(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2304,7 +2304,7 @@ static void inverted_rc_track_right_twist_down_to_up(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2344,10 +2344,10 @@ static void inverted_rc_track_right_twist_down_to_up(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2377,7 +2377,7 @@ static void inverted_rc_track_left_twist_up_to_down(paint_session * session, uin } metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2421,10 +2421,10 @@ static void inverted_rc_track_left_twist_up_to_down(paint_session * session, uin switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2453,7 +2453,7 @@ static void inverted_rc_track_right_twist_up_to_down(paint_session * session, ui } metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2497,10 +2497,10 @@ static void inverted_rc_track_right_twist_up_to_down(paint_session * session, ui switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2545,7 +2545,7 @@ static void inverted_rc_track_half_loop_up(paint_session * session, uint8 rideIn } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -2601,7 +2601,7 @@ static void inverted_rc_track_half_loop_up(paint_session * session, uint8 rideIn break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 32, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -2639,7 +2639,7 @@ static void inverted_rc_track_left_corkscrew_up(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 64, 0x20); break; @@ -2679,10 +2679,10 @@ static void inverted_rc_track_left_corkscrew_up(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 28, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 40, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 40, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height + 40, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 40, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2715,7 +2715,7 @@ static void inverted_rc_track_right_corkscrew_up(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 64, 0x20); break; @@ -2755,10 +2755,10 @@ static void inverted_rc_track_right_corkscrew_up(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 28, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 40, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 40, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height + 40, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 40, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2862,7 +2862,7 @@ static void inverted_rc_track_brakes(paint_session * session, uint8 rideIndex, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -2890,7 +2890,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2975,10 +2975,10 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(paint_session * switch (direction) { case 2: - paint_util_push_tunnel_right(height + 16, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height + 16, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3010,7 +3010,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3095,10 +3095,10 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(paint_session switch (direction) { case 0: - paint_util_push_tunnel_right(height + 16, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height + 16, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3130,7 +3130,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3215,10 +3215,10 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(paint_session switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3250,7 +3250,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3335,10 +3335,10 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(paint_sessio switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -3383,9 +3383,9 @@ static void inverted_rc_track_25_deg_up_left_banked(paint_session * session, uin } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -3427,9 +3427,9 @@ static void inverted_rc_track_25_deg_up_right_banked(paint_session * session, ui } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -3464,7 +3464,7 @@ static void inverted_rc_track_on_ride_photo(paint_session * session, uint8 rideI break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); } @@ -3505,7 +3505,7 @@ static void inverted_rc_track_left_eighth_to_diag(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3610,7 +3610,7 @@ static void inverted_rc_track_right_eighth_to_diag(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3729,7 +3729,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -3834,7 +3834,7 @@ static void inverted_rc_track_right_eighth_bank_to_diag(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -5757,7 +5757,7 @@ static void inverted_rc_track_left_large_half_loop_up(paint_session * session, u break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5872,7 +5872,7 @@ static void inverted_rc_track_left_large_half_loop_up(paint_session * session, u break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 32, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -5900,7 +5900,7 @@ static void inverted_rc_track_right_large_half_loop_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -6015,7 +6015,7 @@ static void inverted_rc_track_right_large_half_loop_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 32, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6054,7 +6054,7 @@ static void inverted_rc_track_block_brakes(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -6082,7 +6082,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -6113,10 +6113,10 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -6148,7 +6148,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -6179,10 +6179,10 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_sessio switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -6228,7 +6228,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -6313,10 +6313,10 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -6348,7 +6348,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -6433,10 +6433,10 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_sessio switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -6495,9 +6495,9 @@ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -6539,9 +6539,9 @@ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -6583,9 +6583,9 @@ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -6627,9 +6627,9 @@ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -6695,9 +6695,9 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -6739,9 +6739,9 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_ } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -6783,9 +6783,9 @@ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -6827,9 +6827,9 @@ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_ } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -6895,9 +6895,9 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_up(paint_session * sess } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -6939,9 +6939,9 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_up(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -6983,9 +6983,9 @@ static void inverted_rc_track_left_banked_25_deg_up_to_flat(paint_session * sess } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -7027,9 +7027,9 @@ static void inverted_rc_track_right_banked_25_deg_up_to_flat(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } diff --git a/src/openrct2/ride/coaster/junior_roller_coaster.c b/src/openrct2/ride/coaster/junior_roller_coaster.c index e253c5fb6f..91648d9158 100644 --- a/src/openrct2/ride/coaster/junior_roller_coaster.c +++ b/src/openrct2/ride/coaster/junior_roller_coaster.c @@ -1875,7 +1875,7 @@ void junior_rc_paint_track_flat(paint_session * session, uint8 rideIndex, uint8 { uint32 imageId = junior_rc_track_pieces_flat[chainType][direction] | gTrackColours[SCHEME_TRACK]; sub_98196C_rotated(direction, imageId, 0, 6, 32, 20, 1, height); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); @@ -1907,7 +1907,7 @@ void junior_rc_paint_station(paint_session * session, uint8 rideIndex, uint8 tra metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else if (direction == 1 || direction == 3) { // height -= 2 (height - 2) imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC]; @@ -1923,7 +1923,7 @@ void junior_rc_paint_station(paint_session * session, uint8 rideIndex, uint8 tra metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); @@ -1939,7 +1939,7 @@ void junior_rc_paint_track_25_deg_up(paint_session * session, uint8 rideIndex, u sint8 tunnel_height[4] = { -8, 8, 8, -8 }; uint8 tunnel_type[4] = { TUNNEL_1, TUNNEL_2, TUNNEL_2, TUNNEL_1 }; - paint_util_push_tunnel_rotated(direction, height + tunnel_height[direction], tunnel_type[direction]); + paint_util_push_tunnel_rotated(session, direction, height + tunnel_height[direction], tunnel_type[direction]); if (track_paint_util_should_paint_supports(session->MapPosition)) { sint32 supportType = (direction & 1) ? 2 : 1; @@ -1956,9 +1956,9 @@ void junior_rc_paint_track_flat_to_25_deg_up(paint_session * session, uint8 ride sub_98196C_rotated(direction, imageId, 0, 6, 32, 20, 1, height); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } if (track_paint_util_should_paint_supports(session->MapPosition)) { @@ -1989,10 +1989,10 @@ void junior_rc_paint_track_25_deg_up_to_flat(paint_session * session, uint8 ride } if (direction & 1) { - paint_util_push_tunnel_right(tunnelHeight, tunnelType); + paint_util_push_tunnel_right(session, tunnelHeight, tunnelType); } else { - paint_util_push_tunnel_left(tunnelHeight, tunnelType); + paint_util_push_tunnel_left(session, tunnelHeight, tunnelType); } if (track_paint_util_should_paint_supports(session->MapPosition)) { @@ -2026,19 +2026,19 @@ static void junior_rc_right_quarter_turn_5_tiles_paint_setup(paint_session * ses } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -2071,12 +2071,12 @@ static void junior_rc_flat_to_left_bank_paint_setup(paint_session * session, uin if (direction & 1) { sub_98197C(image_id, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, 0); + paint_util_push_tunnel_right(session, height, 0); } else { sub_98197C(image_id, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height, 0); + paint_util_push_tunnel_left(session, height, 0); } if (junior_rc_track_pieces_flat_to_left_bank[direction][1] != 0) { @@ -2111,12 +2111,12 @@ static void junior_rc_flat_to_right_bank_paint_setup(paint_session * session, ui if (direction & 1) { sub_98197C(image_id, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, 0); + paint_util_push_tunnel_right(session, height, 0); } else { sub_98197C(image_id, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height, 0); + paint_util_push_tunnel_left(session, height, 0); } if (junior_rc_track_pieces_flat_to_right_bank[direction][1] != 0) { @@ -2240,19 +2240,19 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(paint_sessio } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -2305,10 +2305,10 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(paint_session * session } switch(direction) { - case 0: paint_util_push_tunnel_left(height, TUNNEL_0); break; - case 1: paint_util_push_tunnel_right(height, TUNNEL_2); break; - case 2: paint_util_push_tunnel_left(height, TUNNEL_2); break; - case 3: paint_util_push_tunnel_right(height, TUNNEL_0); break; + case 0: paint_util_push_tunnel_left(session, height, TUNNEL_0); break; + case 1: paint_util_push_tunnel_right(session, height, TUNNEL_2); break; + case 2: paint_util_push_tunnel_left(session, height, TUNNEL_2); break; + case 3: paint_util_push_tunnel_right(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_D0 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -2348,10 +2348,10 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(paint_session * sessio } switch(direction) { - case 0: paint_util_push_tunnel_left(height, TUNNEL_0); break; - case 1: paint_util_push_tunnel_right(height, TUNNEL_2); break; - case 2: paint_util_push_tunnel_left(height, TUNNEL_2); break; - case 3: paint_util_push_tunnel_right(height, TUNNEL_0); break; + case 0: paint_util_push_tunnel_left(session, height, TUNNEL_0); break; + case 1: paint_util_push_tunnel_right(session, height, TUNNEL_2); break; + case 2: paint_util_push_tunnel_left(session, height, TUNNEL_2); break; + case 3: paint_util_push_tunnel_right(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_D0 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -2380,12 +2380,12 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(paint_session * session if (direction & 1) { sub_98197C(image_id, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(tunnelHeight, tunnelType); + paint_util_push_tunnel_right(session, tunnelHeight, tunnelType); } else { sub_98197C(image_id, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(tunnelHeight, tunnelType); + paint_util_push_tunnel_left(session, tunnelHeight, tunnelType); } if (junior_rc_track_pieces_25_deg_up_to_left_bank[direction][1] != 0) { @@ -2431,12 +2431,12 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(paint_session * sessio if (direction & 1) { sub_98197C(image_id, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(tunnelHeight, tunnelType); + paint_util_push_tunnel_right(session, tunnelHeight, tunnelType); } else { sub_98197C(image_id, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(tunnelHeight, tunnelType); + paint_util_push_tunnel_left(session, tunnelHeight, tunnelType); } if (junior_rc_track_pieces_25_deg_up_to_right_bank[direction][1] != 0) { @@ -2524,10 +2524,10 @@ static void junior_rc_left_bank_paint_setup(paint_session * session, uint8 rideI height, get_current_rotation()); if (direction & 1) { - paint_util_push_tunnel_right(height, 0); + paint_util_push_tunnel_right(session, height, 0); } else { - paint_util_push_tunnel_left(height, 0); + paint_util_push_tunnel_left(session, height, 0); } const rct_xy16 pos = session->MapPosition; @@ -2563,16 +2563,16 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(paint_session * s } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); } if (direction == 2 && trackSequence == 6) { - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); } if (direction == 3 && trackSequence == 6) { - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); } switch (trackSequence) { @@ -2605,16 +2605,16 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); } switch (trackSequence) { @@ -2686,7 +2686,7 @@ static void junior_rc_s_bend_left_paint_setup(paint_session * session, uint8 rid if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } switch (trackSequence) { @@ -2696,7 +2696,7 @@ static void junior_rc_s_bend_left_paint_setup(paint_session * session, uint8 rid } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -2750,7 +2750,7 @@ static void junior_rc_s_bend_right_paint_setup(paint_session * session, uint8 ri if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } switch (trackSequence) { @@ -2760,7 +2760,7 @@ static void junior_rc_s_bend_right_paint_setup(paint_session * session, uint8 ri } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -2953,19 +2953,19 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(paint_session * if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); } if (direction == 0 && trackSequence == 3) { - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); } if (direction == 1 && trackSequence == 3) { - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); } uint8 supportType[2][4] = { @@ -3017,19 +3017,19 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(paint_session sub_98197C(imageId, (sint8)offset.x, (sint8)offset.y, boundsLength.x, boundsLength.y, 1, height, boundsOffset.x, boundsOffset.y, height, get_current_rotation()); if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); } if (direction == 0 && trackSequence == 3) { - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); } if (direction == 1 && trackSequence == 3) { - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); } uint8 supportType[2][4] = { @@ -3113,19 +3113,19 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(paint_session } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 0 && trackSequence == 3) { - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); } if (direction == 1 && trackSequence == 3) { - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } sint32 blockedSegments = 0; @@ -3158,19 +3158,19 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(paint_sessi } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); } if (direction == 0 && trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (direction == 1 && trackSequence == 3) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); } sint32 blockedSegments = 0; @@ -3227,19 +3227,19 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(paint_session } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -3273,19 +3273,19 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(paint_sessi } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); } switch (trackSequence) { @@ -3334,12 +3334,12 @@ static void junior_rc_brake_paint_setup(paint_session * session, uint8 rideIndex if (direction & 1) { sub_98196C(image_id, 6, 0, 20, 32, 1, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { sub_98196C(image_id, 0, 6, 32, 20, 1, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } const rct_xy16 pos = session->MapPosition; @@ -3365,12 +3365,12 @@ static void junior_rc_block_brake_paint_setup(paint_session * session, uint8 rid if (direction & 1) { sub_98196C(image_id, 6, 0, 20, 32, 1, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { sub_98196C(image_id, 0, 6, 32, 20, 1, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } const rct_xy16 pos = session->MapPosition; @@ -3401,10 +3401,10 @@ static void junior_rc_left_eighth_to_diag_paint_setup(paint_session * session, u } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } sint32 blockedSegments = 0; @@ -3438,10 +3438,10 @@ static void junior_rc_right_eighth_to_diag_paint_setup(paint_session * session, } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } sint32 blockedSegments = 0; @@ -3572,10 +3572,10 @@ static void junior_rc_left_eighth_to_diag_bank_paint_setup(paint_session * sessi } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } sint32 blockedSegments = 0; @@ -3690,10 +3690,10 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(paint_session * sess } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } sint32 blockedSegments = 0; @@ -4283,16 +4283,16 @@ void junior_rc_paint_track_60_deg_up(paint_session * session, uint8 rideIndex, u switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 56, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 56, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 56, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 56, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -4376,16 +4376,16 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -4448,16 +4448,16 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -4692,16 +4692,16 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(paint_session * session, uin switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_1); + paint_util_push_tunnel_left(session, height, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height, TUNNEL_1); + paint_util_push_tunnel_right(session, height, TUNNEL_1); break; } @@ -4761,16 +4761,16 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(paint_session * session, uin switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_1); + paint_util_push_tunnel_left(session, height, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height, TUNNEL_1); + paint_util_push_tunnel_right(session, height, TUNNEL_1); break; } @@ -4847,12 +4847,12 @@ static void junior_rc_booster_paint_setup(paint_session * session, uint8 rideInd if (direction & 1) { sub_98196C(SPR_JUNIOR_RC_BOOSTER_NE_SW | gTrackColours[SCHEME_TRACK], XoffsetNESW, YoffsetNESW, 20, 32, 1, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { sub_98196C(SPR_JUNIOR_RC_BOOSTER_NW_SE | gTrackColours[SCHEME_TRACK], XoffsetNWSE, YoffsetNWSE, 32, 20, 1, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } const rct_xy16 pos = session->MapPosition; diff --git a/src/openrct2/ride/coaster/lay_down_roller_coaster.c b/src/openrct2/ride/coaster/lay_down_roller_coaster.c index be2a98536e..49a1b2fdaa 100644 --- a/src/openrct2/ride/coaster/lay_down_roller_coaster.c +++ b/src/openrct2/ride/coaster/lay_down_roller_coaster.c @@ -64,7 +64,7 @@ static void lay_down_rc_track_flat(paint_session * session, uint8 rideIndex, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -97,7 +97,7 @@ static void lay_down_rc_track_flat(paint_session * session, uint8 rideIndex, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -118,7 +118,7 @@ static void lay_down_rc_track_station(paint_session * session, uint8 rideIndex, sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 6, height + 24); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 11); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_1); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } else { static const uint32 imageIds[4][3] = { { 16236, 16232, SPR_STATION_BASE_A_SW_NE }, @@ -135,7 +135,7 @@ static void lay_down_rc_track_station(paint_session * session, uint8 rideIndex, sub_98196C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 11); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -183,9 +183,9 @@ static void lay_down_rc_track_25_deg_up(paint_session * session, uint8 rideIndex } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -241,9 +241,9 @@ static void lay_down_rc_track_25_deg_up(paint_session * session, uint8 rideIndex } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -291,9 +291,9 @@ static void lay_down_rc_track_60_deg_up(paint_session * session, uint8 rideIndex } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -313,9 +313,9 @@ static void lay_down_rc_track_60_deg_up(paint_session * session, uint8 rideIndex break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -364,9 +364,9 @@ static void lay_down_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -422,9 +422,9 @@ static void lay_down_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -476,9 +476,9 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -500,9 +500,9 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -555,9 +555,9 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -598,9 +598,9 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(paint_session * session, ui } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -648,9 +648,9 @@ static void lay_down_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -706,9 +706,9 @@ static void lay_down_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -772,7 +772,7 @@ static void lay_down_rc_track_left_quarter_turn_5(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -855,10 +855,10 @@ static void lay_down_rc_track_left_quarter_turn_5(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -887,7 +887,7 @@ static void lay_down_rc_track_left_quarter_turn_5(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -972,10 +972,10 @@ static void lay_down_rc_track_left_quarter_turn_5(paint_session * session, uint8 switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -1014,7 +1014,7 @@ static void lay_down_rc_track_flat_to_left_bank(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1038,7 +1038,7 @@ static void lay_down_rc_track_flat_to_left_bank(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1066,7 +1066,7 @@ static void lay_down_rc_track_flat_to_right_bank(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1090,7 +1090,7 @@ static void lay_down_rc_track_flat_to_right_bank(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1118,7 +1118,7 @@ static void lay_down_rc_track_left_bank_to_flat(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1142,7 +1142,7 @@ static void lay_down_rc_track_left_bank_to_flat(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1170,7 +1170,7 @@ static void lay_down_rc_track_right_bank_to_flat(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1194,7 +1194,7 @@ static void lay_down_rc_track_right_bank_to_flat(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1222,7 +1222,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1306,10 +1306,10 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1338,7 +1338,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -1423,10 +1423,10 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(paint_session * session switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -1466,9 +1466,9 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1507,9 +1507,9 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(paint_session * session, ui } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -1539,9 +1539,9 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1580,9 +1580,9 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -1612,9 +1612,9 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1653,9 +1653,9 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(paint_session * session, ui } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -1685,9 +1685,9 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1726,9 +1726,9 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -1779,7 +1779,7 @@ static void lay_down_rc_track_left_bank(paint_session * session, uint8 rideIndex if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1803,7 +1803,7 @@ static void lay_down_rc_track_left_bank(paint_session * session, uint8 rideIndex metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1836,7 +1836,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1919,10 +1919,10 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1951,7 +1951,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 43, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -2036,10 +2036,10 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -2070,7 +2070,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2153,10 +2153,10 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2185,7 +2185,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 43, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -2270,10 +2270,10 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -2318,7 +2318,7 @@ static void lay_down_rc_track_s_bend_left(paint_session * session, uint8 rideInd } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2381,10 +2381,10 @@ static void lay_down_rc_track_s_bend_left(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2413,7 +2413,7 @@ static void lay_down_rc_track_s_bend_left(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2494,10 +2494,10 @@ static void lay_down_rc_track_s_bend_left(paint_session * session, uint8 rideInd switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2528,7 +2528,7 @@ static void lay_down_rc_track_s_bend_right(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2591,10 +2591,10 @@ static void lay_down_rc_track_s_bend_right(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2623,7 +2623,7 @@ static void lay_down_rc_track_s_bend_right(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2704,10 +2704,10 @@ static void lay_down_rc_track_s_bend_right(paint_session * session, uint8 rideIn switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2741,7 +2741,7 @@ static void lay_down_rc_track_left_vertical_loop(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2889,10 +2889,10 @@ static void lay_down_rc_track_left_vertical_loop(paint_session * session, uint8 } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2921,7 +2921,7 @@ static void lay_down_rc_track_left_vertical_loop(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -3069,10 +3069,10 @@ static void lay_down_rc_track_left_vertical_loop(paint_session * session, uint8 } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3104,7 +3104,7 @@ static void lay_down_rc_track_right_vertical_loop(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -3242,10 +3242,10 @@ static void lay_down_rc_track_right_vertical_loop(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -3270,7 +3270,7 @@ static void lay_down_rc_track_right_vertical_loop(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -3408,10 +3408,10 @@ static void lay_down_rc_track_right_vertical_loop(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -3444,7 +3444,7 @@ static void lay_down_rc_track_left_quarter_turn_3(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3488,10 +3488,10 @@ static void lay_down_rc_track_left_quarter_turn_3(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3520,7 +3520,7 @@ static void lay_down_rc_track_left_quarter_turn_3(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -3566,10 +3566,10 @@ static void lay_down_rc_track_left_quarter_turn_3(paint_session * session, uint8 switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -3608,7 +3608,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3653,10 +3653,10 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3685,7 +3685,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -3731,10 +3731,10 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(paint_session * session, switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -3772,7 +3772,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -3801,10 +3801,10 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3833,7 +3833,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -3864,10 +3864,10 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -3898,7 +3898,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -3930,10 +3930,10 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3962,7 +3962,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 72, 0x20); break; @@ -3993,10 +3993,10 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_general_support_height(height + 72, 0x20); @@ -4042,7 +4042,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4087,10 +4087,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4115,10 +4115,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4163,7 +4163,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4189,7 +4189,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4234,10 +4234,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4262,10 +4262,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4310,7 +4310,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4342,7 +4342,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4387,10 +4387,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4415,10 +4415,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4463,7 +4463,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4489,7 +4489,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4534,10 +4534,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4562,10 +4562,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4610,7 +4610,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4664,7 +4664,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4748,10 +4748,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4776,10 +4776,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -4863,7 +4863,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4889,7 +4889,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4973,10 +4973,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5001,10 +5001,10 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5088,7 +5088,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5120,7 +5120,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5204,10 +5204,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5232,10 +5232,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5319,7 +5319,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5345,7 +5345,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5429,10 +5429,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5457,10 +5457,10 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5544,7 +5544,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5699,7 +5699,7 @@ static void lay_down_rc_track_brakes(paint_session * session, uint8 rideIndex, u if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -5719,7 +5719,7 @@ static void lay_down_rc_track_brakes(paint_session * session, uint8 rideIndex, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -5755,7 +5755,7 @@ static void lay_down_rc_track_on_ride_photo(paint_session * session, uint8 rideI break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } else { @@ -5786,7 +5786,7 @@ static void lay_down_rc_track_on_ride_photo(paint_session * session, uint8 rideI break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); } @@ -5814,7 +5814,7 @@ static void lay_down_rc_track_left_eighth_to_diag(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5904,7 +5904,7 @@ static void lay_down_rc_track_left_eighth_to_diag(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -6008,7 +6008,7 @@ static void lay_down_rc_track_right_eighth_to_diag(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -6098,7 +6098,7 @@ static void lay_down_rc_track_right_eighth_to_diag(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -6216,7 +6216,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -6306,7 +6306,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -6410,7 +6410,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -6500,7 +6500,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10253,7 +10253,7 @@ static void lay_down_rc_track_left_flyer_twist_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10297,10 +10297,10 @@ static void lay_down_rc_track_left_flyer_twist_up(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10325,7 +10325,7 @@ static void lay_down_rc_track_left_flyer_twist_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10369,10 +10369,10 @@ static void lay_down_rc_track_left_flyer_twist_up(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10403,7 +10403,7 @@ static void lay_down_rc_track_right_flyer_twist_up(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10447,10 +10447,10 @@ static void lay_down_rc_track_right_flyer_twist_up(paint_session * session, uint switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10475,7 +10475,7 @@ static void lay_down_rc_track_right_flyer_twist_up(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -10519,10 +10519,10 @@ static void lay_down_rc_track_right_flyer_twist_up(paint_session * session, uint switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -10556,7 +10556,7 @@ static void lay_down_rc_track_left_flyer_twist_down(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10596,10 +10596,10 @@ static void lay_down_rc_track_left_flyer_twist_down(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -10628,7 +10628,7 @@ static void lay_down_rc_track_left_flyer_twist_down(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10668,10 +10668,10 @@ static void lay_down_rc_track_left_flyer_twist_down(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -10706,7 +10706,7 @@ static void lay_down_rc_track_right_flyer_twist_down(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10746,10 +10746,10 @@ static void lay_down_rc_track_right_flyer_twist_down(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -10778,7 +10778,7 @@ static void lay_down_rc_track_right_flyer_twist_down(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -10818,10 +10818,10 @@ static void lay_down_rc_track_right_flyer_twist_down(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -10853,7 +10853,7 @@ static void lay_down_rc_track_flyer_half_loop_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -10914,7 +10914,7 @@ static void lay_down_rc_track_flyer_half_loop_up(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -10939,7 +10939,7 @@ static void lay_down_rc_track_flyer_half_loop_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -11000,7 +11000,7 @@ static void lay_down_rc_track_flyer_half_loop_up(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11030,7 +11030,7 @@ static void lay_down_rc_track_flyer_half_loop_down(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11092,7 +11092,7 @@ static void lay_down_rc_track_flyer_half_loop_down(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -11116,7 +11116,7 @@ static void lay_down_rc_track_flyer_half_loop_down(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11178,7 +11178,7 @@ static void lay_down_rc_track_flyer_half_loop_down(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -11217,7 +11217,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -11260,10 +11260,10 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(paint_session * session, u switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -11296,7 +11296,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -11339,10 +11339,10 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(paint_session * session, u switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -11373,7 +11373,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11417,10 +11417,10 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(paint_session * session, switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -11445,7 +11445,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -11489,10 +11489,10 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(paint_session * session, switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -11526,7 +11526,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 35, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -11566,10 +11566,10 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -11598,7 +11598,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 35, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -11638,10 +11638,10 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -11672,7 +11672,7 @@ static void lay_down_rc_track_block_brakes(paint_session * session, uint8 rideIn break; } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -11692,7 +11692,7 @@ static void lay_down_rc_track_block_brakes(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 32, 0x20); } } diff --git a/src/openrct2/ride/coaster/lim_launched_roller_coaster.c b/src/openrct2/ride/coaster/lim_launched_roller_coaster.c index 9e2dbf7d01..7cd0bab5dd 100644 --- a/src/openrct2/ride/coaster/lim_launched_roller_coaster.c +++ b/src/openrct2/ride/coaster/lim_launched_roller_coaster.c @@ -44,7 +44,7 @@ static void lim_launched_rc_track_station(paint_session * session, uint8 rideInd sub_98196C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -73,7 +73,7 @@ static void lim_launched_rc_track_left_vertical_loop(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -213,10 +213,10 @@ static void lim_launched_rc_track_left_vertical_loop(paint_session * session, ui } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -246,7 +246,7 @@ static void lim_launched_rc_track_right_vertical_loop(paint_session * session, u } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -376,10 +376,10 @@ static void lim_launched_rc_track_right_vertical_loop(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -414,7 +414,7 @@ static void lim_launched_rc_track_left_twist_down_to_up(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -462,10 +462,10 @@ static void lim_launched_rc_track_left_twist_down_to_up(paint_session * session, } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 32, TUNNEL_3); + paint_util_push_tunnel_right(session, height - 32, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height - 32, TUNNEL_3); + paint_util_push_tunnel_left(session, height - 32, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -499,7 +499,7 @@ static void lim_launched_rc_track_right_twist_down_to_up(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -547,10 +547,10 @@ static void lim_launched_rc_track_right_twist_down_to_up(paint_session * session } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 32, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 32, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height + 32, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 32, TUNNEL_3); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -583,7 +583,7 @@ static void lim_launched_rc_track_left_twist_up_to_down(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 32, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 32, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height, 0x20); @@ -632,10 +632,10 @@ static void lim_launched_rc_track_left_twist_up_to_down(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -668,7 +668,7 @@ static void lim_launched_rc_track_right_twist_up_to_down(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 32, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_3); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -717,10 +717,10 @@ static void lim_launched_rc_track_right_twist_up_to_down(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -752,7 +752,7 @@ static void lim_launched_rc_track_left_corkscrew_up(paint_session * session, uin track_paint_util_left_corkscrew_up_supports(session, direction, height); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -795,10 +795,10 @@ static void lim_launched_rc_track_left_corkscrew_up(paint_session * session, uin switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -827,7 +827,7 @@ static void lim_launched_rc_track_right_corkscrew_up(paint_session * session, ui } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -871,10 +871,10 @@ static void lim_launched_rc_track_right_corkscrew_up(paint_session * session, ui switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -910,7 +910,7 @@ static void lim_launched_rc_track_brakes(paint_session * session, uint8 rideInde if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -934,7 +934,7 @@ static void lim_launched_rc_track_90_deg_up(paint_session * session, uint8 rideI sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15705, 0, 0, 2, 20, 31, height, 4, 6, height + 8); break; } - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -969,9 +969,9 @@ static void lim_launched_rc_track_60_deg_up_to_90_deg_up(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } - paint_util_set_vertical_tunnel(height + 56); + paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); break; @@ -1005,10 +1005,10 @@ static void lim_launched_rc_track_90_deg_up_to_60_deg_up(paint_session * session } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 48, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 48, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1035,7 +1035,7 @@ static void lim_launched_rc_track_60_deg_down_to_90_deg_down(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 48, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 80, 0x20); @@ -1101,7 +1101,7 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(paint_ break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1131,7 +1131,7 @@ static void lim_launched_rc_track_block_brakes(paint_session * session, uint8 ri if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -1156,7 +1156,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(paint_session * sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15717, 0, 0, 2, 20, 63, height, 24, 6, height + 8); break; } - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); break; @@ -1186,7 +1186,7 @@ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(paint_session * sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15713, 0, 0, 2, 20, 63, height, 4, 6, height + 8); break; } - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); break; diff --git a/src/openrct2/ride/coaster/looping_roller_coaster.c b/src/openrct2/ride/coaster/looping_roller_coaster.c index 5db6293d3a..a23950ab11 100644 --- a/src/openrct2/ride/coaster/looping_roller_coaster.c +++ b/src/openrct2/ride/coaster/looping_roller_coaster.c @@ -62,7 +62,7 @@ static void looping_rc_track_flat(paint_session * session, uint8 rideIndex, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -80,7 +80,7 @@ static void looping_rc_track_station(paint_session * session, uint8 rideIndex, u sub_98196C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -126,9 +126,9 @@ static void looping_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -175,9 +175,9 @@ static void looping_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -224,9 +224,9 @@ static void looping_rc_track_flat_to_25_deg_up(paint_session * session, uint8 ri } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -277,9 +277,9 @@ static void looping_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uin } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -330,9 +330,9 @@ static void looping_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uin } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -379,9 +379,9 @@ static void looping_rc_track_25_deg_up_to_flat(paint_session * session, uint8 ri } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -444,7 +444,7 @@ static void looping_rc_track_left_quarter_turn_5(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -527,10 +527,10 @@ static void looping_rc_track_left_quarter_turn_5(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -568,7 +568,7 @@ static void looping_rc_track_flat_to_left_bank(paint_session * session, uint8 ri if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -595,7 +595,7 @@ static void looping_rc_track_flat_to_right_bank(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -622,7 +622,7 @@ static void looping_rc_track_left_bank_to_flat(paint_session * session, uint8 ri if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -649,7 +649,7 @@ static void looping_rc_track_right_bank_to_flat(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -676,7 +676,7 @@ static void looping_rc_track_banked_left_quarter_turn_5(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -760,10 +760,10 @@ static void looping_rc_track_banked_left_quarter_turn_5(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -802,9 +802,9 @@ static void looping_rc_track_left_bank_to_25_deg_up(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -833,9 +833,9 @@ static void looping_rc_track_right_bank_to_25_deg_up(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -864,9 +864,9 @@ static void looping_rc_track_25_deg_up_to_left_bank(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -895,9 +895,9 @@ static void looping_rc_track_25_deg_up_to_right_bank(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -947,7 +947,7 @@ static void looping_rc_track_left_bank(paint_session * session, uint8 rideIndex, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -979,7 +979,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1062,10 +1062,10 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1095,7 +1095,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1178,10 +1178,10 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1225,7 +1225,7 @@ static void looping_rc_track_s_bend_left(paint_session * session, uint8 rideInde } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1288,10 +1288,10 @@ static void looping_rc_track_s_bend_left(paint_session * session, uint8 rideInde metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1321,7 +1321,7 @@ static void looping_rc_track_s_bend_right(paint_session * session, uint8 rideInd } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1384,10 +1384,10 @@ static void looping_rc_track_s_bend_right(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1416,7 +1416,7 @@ static void looping_rc_track_left_vertical_loop(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -1568,10 +1568,10 @@ static void looping_rc_track_left_vertical_loop(paint_session * session, uint8 r } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1600,7 +1600,7 @@ static void looping_rc_track_right_vertical_loop(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -1745,10 +1745,10 @@ static void looping_rc_track_right_vertical_loop(paint_session * session, uint8 } switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -1779,7 +1779,7 @@ static void looping_rc_track_left_quarter_turn_3(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1823,10 +1823,10 @@ static void looping_rc_track_left_quarter_turn_3(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1864,7 +1864,7 @@ static void looping_rc_track_left_quarter_turn_3_bank(paint_session * session, u } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1909,10 +1909,10 @@ static void looping_rc_track_left_quarter_turn_3_bank(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1949,7 +1949,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1978,10 +1978,10 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2011,7 +2011,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2043,10 +2043,10 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sess } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2091,7 +2091,7 @@ static void looping_rc_track_left_half_banked_helix_up_small(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2136,10 +2136,10 @@ static void looping_rc_track_left_half_banked_helix_up_small(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2164,10 +2164,10 @@ static void looping_rc_track_left_half_banked_helix_up_small(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2212,7 +2212,7 @@ static void looping_rc_track_left_half_banked_helix_up_small(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2242,7 +2242,7 @@ static void looping_rc_track_right_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2287,10 +2287,10 @@ static void looping_rc_track_right_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2315,10 +2315,10 @@ static void looping_rc_track_right_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2363,7 +2363,7 @@ static void looping_rc_track_right_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2415,7 +2415,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2499,10 +2499,10 @@ static void looping_rc_track_left_half_banked_helix_up_large(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2527,10 +2527,10 @@ static void looping_rc_track_left_half_banked_helix_up_large(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2614,7 +2614,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(paint_session * ses } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2644,7 +2644,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2728,10 +2728,10 @@ static void looping_rc_track_right_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2756,10 +2756,10 @@ static void looping_rc_track_right_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2843,7 +2843,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2955,7 +2955,7 @@ static void looping_rc_track_brakes(paint_session * session, uint8 rideIndex, ui if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -2981,9 +2981,9 @@ static void looping_rc_track_25_deg_up_left_banked(paint_session * session, uint metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -3010,9 +3010,9 @@ static void looping_rc_track_25_deg_up_right_banked(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -3048,7 +3048,7 @@ static void looping_rc_track_on_ride_photo(paint_session * session, uint8 rideIn break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -3086,7 +3086,7 @@ static void looping_rc_track_left_eighth_to_diag(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3177,7 +3177,7 @@ static void looping_rc_track_right_eighth_to_diag(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3282,7 +3282,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(paint_session * session, u } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3373,7 +3373,7 @@ static void looping_rc_track_right_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5458,7 +5458,7 @@ static void looping_rc_track_block_brakes(paint_session * session, uint8 rideInd if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -5484,7 +5484,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5513,10 +5513,10 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5546,7 +5546,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5578,10 +5578,10 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5625,7 +5625,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5708,10 +5708,10 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5741,7 +5741,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5824,10 +5824,10 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5872,9 +5872,9 @@ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5902,9 +5902,9 @@ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5932,9 +5932,9 @@ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5962,9 +5962,9 @@ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -6015,9 +6015,9 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6044,9 +6044,9 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6073,9 +6073,9 @@ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6102,9 +6102,9 @@ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6156,9 +6156,9 @@ static void looping_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6186,9 +6186,9 @@ static void looping_rc_track_flat_to_right_banked_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -6216,9 +6216,9 @@ static void looping_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6246,9 +6246,9 @@ static void looping_rc_track_right_banked_25_deg_up_to_flat(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6303,7 +6303,7 @@ static void looping_rc_track_booster(paint_session * session, uint8 rideIndex, u if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/mine_ride.c b/src/openrct2/ride/coaster/mine_ride.c index 32aff04f1f..0a92f77240 100644 --- a/src/openrct2/ride/coaster/mine_ride.c +++ b/src/openrct2/ride/coaster/mine_ride.c @@ -45,7 +45,7 @@ static void mine_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -63,7 +63,7 @@ static void mine_ride_track_station(paint_session * session, uint8 rideIndex, ui sub_98196C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -98,9 +98,9 @@ static void mine_ride_track_25_deg_up(paint_session * session, uint8 rideIndex, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -136,9 +136,9 @@ static void mine_ride_track_flat_to_25_deg_up(paint_session * session, uint8 rid break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -174,9 +174,9 @@ static void mine_ride_track_25_deg_up_to_flat(paint_session * session, uint8 rid break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -224,7 +224,7 @@ static void mine_ride_track_left_quarter_turn_5(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -310,10 +310,10 @@ static void mine_ride_track_left_quarter_turn_5(paint_session * session, uint8 r } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -360,7 +360,7 @@ static void mine_ride_track_flat_to_left_bank(paint_session * session, uint8 rid } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -396,7 +396,7 @@ static void mine_ride_track_flat_to_right_bank(paint_session * session, uint8 ri } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -432,7 +432,7 @@ static void mine_ride_track_left_bank_to_flat(paint_session * session, uint8 rid } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -468,7 +468,7 @@ static void mine_ride_track_right_bank_to_flat(paint_session * session, uint8 ri } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -498,7 +498,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -585,10 +585,10 @@ static void mine_ride_track_banked_left_quarter_turn_5(paint_session * session, } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -636,9 +636,9 @@ static void mine_ride_track_left_bank_to_25_deg_up(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -676,9 +676,9 @@ static void mine_ride_track_right_bank_to_25_deg_up(paint_session * session, uin break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -716,9 +716,9 @@ static void mine_ride_track_25_deg_up_to_left_bank(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -756,9 +756,9 @@ static void mine_ride_track_25_deg_up_to_right_bank(paint_session * session, uin break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -817,7 +817,7 @@ static void mine_ride_track_left_bank(paint_session * session, uint8 rideIndex, } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -852,7 +852,7 @@ static void mine_ride_track_s_bend_left(paint_session * session, uint8 rideIndex break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -918,10 +918,10 @@ static void mine_ride_track_s_bend_left(paint_session * session, uint8 rideIndex } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -954,7 +954,7 @@ static void mine_ride_track_s_bend_right(paint_session * session, uint8 rideInde break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1020,10 +1020,10 @@ static void mine_ride_track_s_bend_right(paint_session * session, uint8 rideInde } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1056,7 +1056,7 @@ static void mine_ride_track_left_quarter_turn_3(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1103,10 +1103,10 @@ static void mine_ride_track_left_quarter_turn_3(paint_session * session, uint8 r } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1147,7 +1147,7 @@ static void mine_ride_track_left_quarter_turn_3_bank(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1195,10 +1195,10 @@ static void mine_ride_track_left_quarter_turn_3_bank(paint_session * session, ui } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1239,7 +1239,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1287,10 +1287,10 @@ static void mine_ride_track_left_half_banked_helix_up_small(paint_session * sess } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1318,10 +1318,10 @@ static void mine_ride_track_left_half_banked_helix_up_small(paint_session * sess } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1369,7 +1369,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1402,7 +1402,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1450,10 +1450,10 @@ static void mine_ride_track_right_half_banked_helix_up_small(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1481,10 +1481,10 @@ static void mine_ride_track_right_half_banked_helix_up_small(paint_session * ses } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1532,7 +1532,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1587,7 +1587,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1674,10 +1674,10 @@ static void mine_ride_track_left_half_banked_helix_up_large(paint_session * sess } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1705,10 +1705,10 @@ static void mine_ride_track_left_half_banked_helix_up_large(paint_session * sess } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1795,7 +1795,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1828,7 +1828,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1915,10 +1915,10 @@ static void mine_ride_track_right_half_banked_helix_up_large(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1946,10 +1946,10 @@ static void mine_ride_track_right_half_banked_helix_up_large(paint_session * ses } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2036,7 +2036,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2096,7 +2096,7 @@ static void mine_ride_track_on_ride_photo(paint_session * session, uint8 rideInd break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -2125,7 +2125,7 @@ static void mine_ride_track_left_eighth_to_diag(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2219,7 +2219,7 @@ static void mine_ride_track_right_eighth_to_diag(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2327,7 +2327,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2421,7 +2421,7 @@ static void mine_ride_track_right_eighth_bank_to_diag(paint_session * session, u break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); diff --git a/src/openrct2/ride/coaster/mine_train_coaster.c b/src/openrct2/ride/coaster/mine_train_coaster.c index 33508d8cfd..4ff4c2d440 100644 --- a/src/openrct2/ride/coaster/mine_train_coaster.c +++ b/src/openrct2/ride/coaster/mine_train_coaster.c @@ -62,7 +62,7 @@ static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, u break; } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -85,7 +85,7 @@ static void mine_train_rc_track_station(paint_session * session, uint8 rideIndex } track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 3); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -133,9 +133,9 @@ static void mine_train_rc_track_25_deg_up(paint_session * session, uint8 rideInd } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -163,9 +163,9 @@ static void mine_train_rc_track_60_deg_up(paint_session * session, uint8 rideInd break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -214,9 +214,9 @@ static void mine_train_rc_track_flat_to_25_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -246,9 +246,9 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -278,9 +278,9 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -329,9 +329,9 @@ static void mine_train_rc_track_25_deg_up_to_flat(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -397,7 +397,7 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -497,10 +497,10 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -539,7 +539,7 @@ static void mine_train_rc_track_flat_to_left_bank(paint_session * session, uint8 wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -567,7 +567,7 @@ static void mine_train_rc_track_flat_to_right_bank(paint_session * session, uint wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -595,7 +595,7 @@ static void mine_train_rc_track_left_bank_to_flat(paint_session * session, uint8 wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -623,7 +623,7 @@ static void mine_train_rc_track_right_bank_to_flat(paint_session * session, uint wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -653,7 +653,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -754,10 +754,10 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -797,9 +797,9 @@ static void mine_train_rc_track_left_bank_to_25_deg_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -829,9 +829,9 @@ static void mine_train_rc_track_right_bank_to_25_deg_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -861,9 +861,9 @@ static void mine_train_rc_track_25_deg_up_to_left_bank(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -893,9 +893,9 @@ static void mine_train_rc_track_25_deg_up_to_right_bank(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -946,7 +946,7 @@ static void mine_train_rc_track_left_bank(paint_session * session, uint8 rideInd wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -981,7 +981,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1081,10 +1081,10 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1117,7 +1117,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1217,10 +1217,10 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1267,7 +1267,7 @@ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideI break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1337,10 +1337,10 @@ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideI } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1373,7 +1373,7 @@ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 ride break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1443,10 +1443,10 @@ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 ride } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1479,7 +1479,7 @@ static void mine_train_rc_track_left_quarter_turn_3(paint_session * session, uin break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1540,10 +1540,10 @@ static void mine_train_rc_track_left_quarter_turn_3(paint_session * session, uin } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1584,7 +1584,7 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1646,10 +1646,10 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(paint_session * session } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1689,7 +1689,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(paint_session * se break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1736,10 +1736,10 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(paint_session * se } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1772,7 +1772,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1819,10 +1819,10 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(paint_session * s } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1870,7 +1870,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1933,10 +1933,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -1965,10 +1965,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -2031,7 +2031,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2065,7 +2065,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2128,10 +2128,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -2160,10 +2160,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -2226,7 +2226,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2282,7 +2282,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2387,10 +2387,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -2419,10 +2419,10 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -2527,7 +2527,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2561,7 +2561,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2664,10 +2664,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -2696,10 +2696,10 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -2802,7 +2802,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2848,7 +2848,7 @@ static void mine_train_rc_track_brakes(paint_session * session, uint8 rideIndex, wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -2875,7 +2875,7 @@ static void mine_train_rc_track_on_ride_photo(paint_session * session, uint8 rid break; } track_paint_util_onride_photo_paint(session, direction, height + 2, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -2904,7 +2904,7 @@ static void mine_train_rc_track_left_eighth_to_diag(paint_session * session, uin break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3016,7 +3016,7 @@ static void mine_train_rc_track_right_eighth_to_diag(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3142,7 +3142,7 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3254,7 +3254,7 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5436,7 +5436,7 @@ static void mine_train_rc_track_block_brakes(paint_session * session, uint8 ride wooden_a_supports_paint_setup(session, 7, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/mini_roller_coaster.c b/src/openrct2/ride/coaster/mini_roller_coaster.c index 6a48b4792e..443928713c 100644 --- a/src/openrct2/ride/coaster/mini_roller_coaster.c +++ b/src/openrct2/ride/coaster/mini_roller_coaster.c @@ -74,7 +74,7 @@ static void mini_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 t break; } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -96,7 +96,7 @@ static void mini_rc_track_station(paint_session * session, uint8 rideIndex, uint sub_98196C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -160,9 +160,9 @@ static void mini_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -198,9 +198,9 @@ static void mini_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -265,9 +265,9 @@ static void mini_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideI } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -305,9 +305,9 @@ static void mini_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -345,9 +345,9 @@ static void mini_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -412,9 +412,9 @@ static void mini_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideI } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -480,7 +480,7 @@ static void mini_rc_track_left_quarter_turn_5(paint_session * session, uint8 rid break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -566,10 +566,10 @@ static void mini_rc_track_left_quarter_turn_5(paint_session * session, uint8 rid } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -616,7 +616,7 @@ static void mini_rc_track_flat_to_left_bank(paint_session * session, uint8 rideI } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -652,7 +652,7 @@ static void mini_rc_track_flat_to_right_bank(paint_session * session, uint8 ride } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -688,7 +688,7 @@ static void mini_rc_track_left_bank_to_flat(paint_session * session, uint8 rideI } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -724,7 +724,7 @@ static void mini_rc_track_right_bank_to_flat(paint_session * session, uint8 ride } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -754,7 +754,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -841,10 +841,10 @@ static void mini_rc_track_banked_left_quarter_turn_5(paint_session * session, ui } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -892,9 +892,9 @@ static void mini_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -932,9 +932,9 @@ static void mini_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -972,9 +972,9 @@ static void mini_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1012,9 +1012,9 @@ static void mini_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1073,7 +1073,7 @@ static void mini_rc_track_left_bank(paint_session * session, uint8 rideIndex, ui } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -1108,7 +1108,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1194,10 +1194,10 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1230,7 +1230,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1316,10 +1316,10 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1366,7 +1366,7 @@ static void mini_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1432,10 +1432,10 @@ static void mini_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1468,7 +1468,7 @@ static void mini_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1534,10 +1534,10 @@ static void mini_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1570,7 +1570,7 @@ static void mini_rc_track_left_quarter_turn_3(paint_session * session, uint8 rid break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1617,10 +1617,10 @@ static void mini_rc_track_left_quarter_turn_3(paint_session * session, uint8 rid } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1661,7 +1661,7 @@ static void mini_rc_track_left_quarter_turn_3_bank(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1709,10 +1709,10 @@ static void mini_rc_track_left_quarter_turn_3_bank(paint_session * session, uint } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1752,7 +1752,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1784,10 +1784,10 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1820,7 +1820,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1852,10 +1852,10 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1903,7 +1903,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1951,10 +1951,10 @@ static void mini_rc_track_left_half_banked_helix_up_small(paint_session * sessio } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1982,10 +1982,10 @@ static void mini_rc_track_left_half_banked_helix_up_small(paint_session * sessio } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2033,7 +2033,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2066,7 +2066,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2114,10 +2114,10 @@ static void mini_rc_track_right_half_banked_helix_up_small(paint_session * sessi } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2145,10 +2145,10 @@ static void mini_rc_track_right_half_banked_helix_up_small(paint_session * sessi } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2196,7 +2196,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2251,7 +2251,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2338,10 +2338,10 @@ static void mini_rc_track_left_half_banked_helix_up_large(paint_session * sessio } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2369,10 +2369,10 @@ static void mini_rc_track_left_half_banked_helix_up_large(paint_session * sessio } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2459,7 +2459,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2492,7 +2492,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2579,10 +2579,10 @@ static void mini_rc_track_right_half_banked_helix_up_large(paint_session * sessi } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2610,10 +2610,10 @@ static void mini_rc_track_right_half_banked_helix_up_large(paint_session * sessi } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2700,7 +2700,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2813,7 +2813,7 @@ static void mini_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -2848,9 +2848,9 @@ static void mini_rc_track_25_deg_up_left_banked(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2886,9 +2886,9 @@ static void mini_rc_track_25_deg_up_right_banked(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2924,7 +2924,7 @@ static void mini_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -2965,7 +2965,7 @@ static void mini_rc_track_left_eighth_to_diag(paint_session * session, uint8 rid break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3059,7 +3059,7 @@ static void mini_rc_track_right_eighth_to_diag(paint_session * session, uint8 ri break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3167,7 +3167,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3261,7 +3261,7 @@ static void mini_rc_track_right_eighth_bank_to_diag(paint_session * session, uin break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5095,7 +5095,7 @@ static void mini_rc_track_block_brakes(paint_session * session, uint8 rideIndex, } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -5124,7 +5124,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5156,10 +5156,10 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * s } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5192,7 +5192,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5224,10 +5224,10 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5274,7 +5274,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5360,10 +5360,10 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * s } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5396,7 +5396,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -5482,10 +5482,10 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -5539,9 +5539,9 @@ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5578,9 +5578,9 @@ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * se break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5617,9 +5617,9 @@ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5656,9 +5656,9 @@ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * se break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -5718,9 +5718,9 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -5756,9 +5756,9 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -5794,9 +5794,9 @@ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -5832,9 +5832,9 @@ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -5895,9 +5895,9 @@ static void mini_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -5934,9 +5934,9 @@ static void mini_rc_track_flat_to_right_banked_25_deg_up(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -5973,9 +5973,9 @@ static void mini_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6012,9 +6012,9 @@ static void mini_rc_track_right_banked_25_deg_up_to_flat(paint_session * session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -6067,7 +6067,7 @@ static void mini_rc_track_left_curved_lift_hill(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -6099,10 +6099,10 @@ static void mini_rc_track_left_curved_lift_hill(paint_session * session, uint8 r } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 16, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 16, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6134,7 +6134,7 @@ static void mini_rc_track_right_curved_lift_hill(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -6166,10 +6166,10 @@ static void mini_rc_track_right_curved_lift_hill(paint_session * session, uint8 } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 16, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 16, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -6203,7 +6203,7 @@ static void mini_rc_track_booster(paint_session * session, uint8 rideIndex, uint } break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/mini_suspended_coaster.c b/src/openrct2/ride/coaster/mini_suspended_coaster.c index 10006914e8..cde0696bdd 100644 --- a/src/openrct2/ride/coaster/mini_suspended_coaster.c +++ b/src/openrct2/ride/coaster/mini_suspended_coaster.c @@ -67,7 +67,7 @@ static void mini_suspended_rc_track_flat(paint_session * session, uint8 rideInde } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -86,7 +86,7 @@ static void mini_suspended_rc_track_station(paint_session * session, uint8 rideI sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 2, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 3); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_1); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -145,9 +145,9 @@ static void mini_suspended_rc_track_25_deg_up(paint_session * session, uint8 rid } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -206,9 +206,9 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -267,9 +267,9 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -325,7 +325,7 @@ static void mini_suspended_rc_track_left_quarter_turn_5(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -419,10 +419,10 @@ static void mini_suspended_rc_track_left_quarter_turn_5(paint_session * session, switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -470,7 +470,7 @@ static void mini_suspended_rc_track_s_bend_left(paint_session * session, uint8 r } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -560,10 +560,10 @@ static void mini_suspended_rc_track_s_bend_left(paint_session * session, uint8 r switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -604,7 +604,7 @@ static void mini_suspended_rc_track_s_bend_right(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -694,10 +694,10 @@ static void mini_suspended_rc_track_s_bend_right(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -738,7 +738,7 @@ static void mini_suspended_rc_track_left_quarter_turn_3(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -793,10 +793,10 @@ static void mini_suspended_rc_track_left_quarter_turn_3(paint_session * session, switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -844,7 +844,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -958,7 +958,7 @@ static void mini_suspended_rc_track_right_eighth_to_diag(paint_session * session } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; diff --git a/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c b/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c index 8208bd5842..412d309e1f 100644 --- a/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c +++ b/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c @@ -59,7 +59,7 @@ static void multi_dimension_rc_track_flat(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -79,7 +79,7 @@ static void multi_dimension_rc_track_flat(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -122,7 +122,7 @@ static void multi_dimension_rc_track_station(paint_session * session, uint8 ride track_paint_util_draw_station_covers(session, EDGE_SW, hasFence, entranceStyle, direction, height); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -169,9 +169,9 @@ static void multi_dimension_rc_track_25_deg_up(paint_session * session, uint8 ri } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -210,9 +210,9 @@ static void multi_dimension_rc_track_25_deg_up(paint_session * session, uint8 ri } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -240,9 +240,9 @@ static void multi_dimension_rc_track_60_deg_up(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 24, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -262,9 +262,9 @@ static void multi_dimension_rc_track_60_deg_up(paint_session * session, uint8 ri break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -313,9 +313,9 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(paint_session * session, } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -354,9 +354,9 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -386,9 +386,9 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -410,9 +410,9 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -443,9 +443,9 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -486,9 +486,9 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(paint_session * sess } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -536,9 +536,9 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(paint_session * session, } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -577,9 +577,9 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -643,7 +643,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -726,10 +726,10 @@ static void multi_dimension_rc_track_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -758,7 +758,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -843,10 +843,10 @@ static void multi_dimension_rc_track_left_quarter_turn_5(paint_session * session switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -885,7 +885,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(paint_session * session, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -909,7 +909,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -937,7 +937,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(paint_session * session, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -961,7 +961,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -989,7 +989,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(paint_session * session, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1013,7 +1013,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1041,7 +1041,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(paint_session * session, if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1065,7 +1065,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1093,7 +1093,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(paint_session * } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1177,10 +1177,10 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1209,7 +1209,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(paint_session * metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -1294,10 +1294,10 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(paint_session * switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -1337,9 +1337,9 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1378,9 +1378,9 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(paint_session * sess } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -1410,9 +1410,9 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1451,9 +1451,9 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 48, 0x20); } @@ -1483,9 +1483,9 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1524,9 +1524,9 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(paint_session * sess } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -1556,9 +1556,9 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1597,9 +1597,9 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(paint_session * ses } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_general_support_height(height + 40, 0x20); } @@ -1650,7 +1650,7 @@ static void multi_dimension_rc_track_left_bank(paint_session * session, uint8 ri if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -1674,7 +1674,7 @@ static void multi_dimension_rc_track_left_bank(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -1707,7 +1707,7 @@ static void multi_dimension_rc_track_s_bend_left(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1770,10 +1770,10 @@ static void multi_dimension_rc_track_s_bend_left(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1802,7 +1802,7 @@ static void multi_dimension_rc_track_s_bend_left(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -1883,10 +1883,10 @@ static void multi_dimension_rc_track_s_bend_left(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -1917,7 +1917,7 @@ static void multi_dimension_rc_track_s_bend_right(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1980,10 +1980,10 @@ static void multi_dimension_rc_track_s_bend_right(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2012,7 +2012,7 @@ static void multi_dimension_rc_track_s_bend_right(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2093,10 +2093,10 @@ static void multi_dimension_rc_track_s_bend_right(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2127,7 +2127,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2171,10 +2171,10 @@ static void multi_dimension_rc_track_left_quarter_turn_3(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2203,7 +2203,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2249,10 +2249,10 @@ static void multi_dimension_rc_track_left_quarter_turn_3(paint_session * session switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2291,7 +2291,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2336,10 +2336,10 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2368,7 +2368,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -2414,10 +2414,10 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(paint_session * se switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -2456,7 +2456,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2501,10 +2501,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2529,10 +2529,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2577,7 +2577,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2603,7 +2603,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2648,10 +2648,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2676,10 +2676,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2724,7 +2724,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2756,7 +2756,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2801,10 +2801,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2829,10 +2829,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2877,7 +2877,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2903,7 +2903,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2948,10 +2948,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2976,10 +2976,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3024,7 +3024,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3078,7 +3078,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3162,10 +3162,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3190,10 +3190,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -3277,7 +3277,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3303,7 +3303,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3387,10 +3387,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3415,10 +3415,10 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -3502,7 +3502,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3534,7 +3534,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3618,10 +3618,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -3646,10 +3646,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3733,7 +3733,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3759,7 +3759,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3843,10 +3843,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -3871,10 +3871,10 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3958,7 +3958,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4006,7 +4006,7 @@ static void multi_dimension_rc_track_brakes(paint_session * session, uint8 rideI if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -4026,7 +4026,7 @@ static void multi_dimension_rc_track_brakes(paint_session * session, uint8 rideI metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -4062,7 +4062,7 @@ static void multi_dimension_rc_track_on_ride_photo(paint_session * session, uint break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } else { @@ -4093,7 +4093,7 @@ static void multi_dimension_rc_track_on_ride_photo(paint_session * session, uint break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); } @@ -4119,7 +4119,7 @@ static void multi_dimension_rc_track_90_deg_up(paint_session * session, uint8 ri sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16133, 0, 0, 2, 20, 31, height, 4, 6, height + 8); break; } - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -4143,7 +4143,7 @@ static void multi_dimension_rc_track_90_deg_up(paint_session * session, uint8 ri sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 26536, 0, 0, 32, 20, 3, height + 24, 0, 6, height + 56); break; } - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); break; @@ -4180,9 +4180,9 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } - paint_util_set_vertical_tunnel(height + 56); + paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); break; @@ -4207,9 +4207,9 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } - paint_util_set_vertical_tunnel(height + 56); + paint_util_set_vertical_tunnel(session, height + 56); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); break; @@ -4245,10 +4245,10 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(paint_session * sess } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 48, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_8); break; case 2: - paint_util_push_tunnel_left(height + 48, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_8); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -4270,10 +4270,10 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(paint_session * sess } switch (direction) { case 1: - paint_util_push_tunnel_right(height + 48, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 48, TUNNEL_5); break; case 2: - paint_util_push_tunnel_left(height + 48, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 48, TUNNEL_5); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -4302,7 +4302,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 48, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_8); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 80, 0x20); @@ -4328,7 +4328,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 48, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 48, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 96, 0x20); @@ -4361,7 +4361,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4451,7 +4451,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -4555,7 +4555,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4645,7 +4645,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -4763,7 +4763,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4853,7 +4853,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -4957,7 +4957,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5047,7 +5047,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -8551,7 +8551,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -8595,10 +8595,10 @@ static void multi_dimension_rc_track_left_flyer_twist_up(paint_session * session switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -8623,7 +8623,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -8667,10 +8667,10 @@ static void multi_dimension_rc_track_left_flyer_twist_up(paint_session * session switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -8701,7 +8701,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -8745,10 +8745,10 @@ static void multi_dimension_rc_track_right_flyer_twist_up(paint_session * sessio switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -8773,7 +8773,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(paint_session * sessio } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -8817,10 +8817,10 @@ static void multi_dimension_rc_track_right_flyer_twist_up(paint_session * sessio switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_general_support_height(height + 32, 0x20); @@ -8854,7 +8854,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -8894,10 +8894,10 @@ static void multi_dimension_rc_track_left_flyer_twist_down(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -8926,7 +8926,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -8966,10 +8966,10 @@ static void multi_dimension_rc_track_left_flyer_twist_down(paint_session * sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -9004,7 +9004,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -9044,10 +9044,10 @@ static void multi_dimension_rc_track_right_flyer_twist_down(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -9076,7 +9076,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_general_support_height(height + 32, 0x20); break; @@ -9116,10 +9116,10 @@ static void multi_dimension_rc_track_right_flyer_twist_down(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -9150,7 +9150,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 32, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -9212,7 +9212,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -9274,7 +9274,7 @@ static void multi_dimension_rc_track_block_brakes(paint_session * session, uint8 break; } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } else { @@ -9294,7 +9294,7 @@ static void multi_dimension_rc_track_block_brakes(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } } @@ -9356,7 +9356,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -9416,7 +9416,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -9446,7 +9446,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(p break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 32, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -9508,7 +9508,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(p break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -9612,7 +9612,7 @@ static void multi_dimension_rc_track_elem_255(paint_session * session, uint8 rid break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -9672,7 +9672,7 @@ static void multi_dimension_rc_track_elem_255(paint_session * session, uint8 rid break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); diff --git a/src/openrct2/ride/coaster/reverse_freefall_coaster.c b/src/openrct2/ride/coaster/reverse_freefall_coaster.c index db723d6876..2ddd1221a9 100644 --- a/src/openrct2/ride/coaster/reverse_freefall_coaster.c +++ b/src/openrct2/ride/coaster/reverse_freefall_coaster.c @@ -209,11 +209,11 @@ static void paint_reverse_freefall_rc_flat(paint_session * session, uint8 rideIn if (direction & 1) { uint32 imageId = SPR_REVERSE_FREEFALL_RC_FLAT_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { uint32 imageId = SPR_REVERSE_FREEFALL_RC_FLAT_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -240,7 +240,7 @@ static void paint_reverse_freefall_rc_station(paint_session * session, uint8 rid sub_98199C(imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else if (direction == 1 || direction == 3) { // height -= 2 (height - 2) imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC]; @@ -251,7 +251,7 @@ static void paint_reverse_freefall_rc_station(paint_session * session, uint8 rid sub_98199C(imageId, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } track_paint_util_draw_station_platform(session, ride, direction, height, 5, mapElement); @@ -286,9 +286,9 @@ static void paint_reverse_freefall_rc_slope(paint_session * session, uint8 rideI sint32 tunnelOffset = tunnelOffsets03[trackSequence]; if (direction & 1) { - paint_util_push_tunnel_right(height + tunnelOffset, TUNNEL_6); + paint_util_push_tunnel_right(session, height + tunnelOffset, TUNNEL_6); } else { - paint_util_push_tunnel_left(height + tunnelOffset, TUNNEL_6); + paint_util_push_tunnel_left(session, height + tunnelOffset, TUNNEL_6); } } else { bbHeight = bbHeights12[trackSequence]; @@ -348,7 +348,7 @@ static void paint_reverse_freefall_rc_vertical(paint_session * session, uint8 ri } else { sub_98197C_rotated(direction, trackImageId, 0, 0, 2, 20, 79, height, 30, 6, height); } - paint_util_set_vertical_tunnel(height + 80); + paint_util_set_vertical_tunnel(session, height + 80); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 80, 0x20); break; diff --git a/src/openrct2/ride/coaster/reverser_roller_coaster.c b/src/openrct2/ride/coaster/reverser_roller_coaster.c index 05e5970586..e413c466cf 100644 --- a/src/openrct2/ride/coaster/reverser_roller_coaster.c +++ b/src/openrct2/ride/coaster/reverser_roller_coaster.c @@ -75,7 +75,7 @@ static void reverser_rc_track_flat(paint_session * session, uint8 rideIndex, uin break; } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -93,7 +93,7 @@ static void reverser_rc_track_station(paint_session * session, uint8 rideIndex, sub_98199C_rotated(direction, imageIds[direction][0] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 27, 2, height, 0, 2, height); wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -141,9 +141,9 @@ static void reverser_rc_track_25_deg_up(paint_session * session, uint8 rideIndex } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -192,9 +192,9 @@ static void reverser_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -243,9 +243,9 @@ static void reverser_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -293,7 +293,7 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -393,10 +393,10 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -436,7 +436,7 @@ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideInd break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -506,10 +506,10 @@ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideInd } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -542,7 +542,7 @@ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIn break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -612,10 +612,10 @@ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIn } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -648,7 +648,7 @@ static void reverser_rc_track_left_quarter_turn_3(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -695,10 +695,10 @@ static void reverser_rc_track_left_quarter_turn_3(paint_session * session, uint8 } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -729,7 +729,7 @@ static void reverser_rc_track_brakes(paint_session * session, uint8 rideIndex, u wooden_a_supports_paint_setup(session, 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -758,7 +758,7 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -872,10 +872,10 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -908,7 +908,7 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1022,10 +1022,10 @@ static void reverser_rc_track_right_reverser(paint_session * session, uint8 ride } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); diff --git a/src/openrct2/ride/coaster/side_friction_roller_coaster.c b/src/openrct2/ride/coaster/side_friction_roller_coaster.c index 4992cd42b7..89825163c9 100644 --- a/src/openrct2/ride/coaster/side_friction_roller_coaster.c +++ b/src/openrct2/ride/coaster/side_friction_roller_coaster.c @@ -68,7 +68,7 @@ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex break; } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -86,7 +86,7 @@ static void side_friction_rc_track_station(paint_session * session, uint8 rideIn sub_98197C_rotated(direction, imageIds[direction] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 27, 2, height, 0, 2, height); wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -142,9 +142,9 @@ static void side_friction_rc_track_25_deg_up(paint_session * session, uint8 ride } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -201,9 +201,9 @@ static void side_friction_rc_track_flat_to_25_deg_up(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -260,9 +260,9 @@ static void side_friction_rc_track_25_deg_up_to_flat(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -314,7 +314,7 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -430,10 +430,10 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -477,7 +477,7 @@ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 ri break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -559,10 +559,10 @@ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 ri } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -599,7 +599,7 @@ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -681,10 +681,10 @@ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 r } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -721,7 +721,7 @@ static void side_friction_rc_track_left_quarter_turn_3(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -776,10 +776,10 @@ static void side_friction_rc_track_left_quarter_turn_3(paint_session * session, } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -812,7 +812,7 @@ static void side_friction_rc_track_brakes(paint_session * session, uint8 rideInd wooden_a_supports_paint_setup(session, 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -845,7 +845,7 @@ static void side_friction_rc_track_left_eighth_to_diag(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -973,7 +973,7 @@ static void side_friction_rc_track_right_eighth_to_diag(paint_session * session, break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); diff --git a/src/openrct2/ride/coaster/stand_up_roller_coaster.c b/src/openrct2/ride/coaster/stand_up_roller_coaster.c index eeca03b93e..b5cad7cf71 100644 --- a/src/openrct2/ride/coaster/stand_up_roller_coaster.c +++ b/src/openrct2/ride/coaster/stand_up_roller_coaster.c @@ -62,7 +62,7 @@ static void stand_up_rc_track_flat(paint_session * session, uint8 rideIndex, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -85,7 +85,7 @@ static void stand_up_rc_track_station(paint_session * session, uint8 rideIndex, sub_98196C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -131,9 +131,9 @@ static void stand_up_rc_track_25_deg_up(paint_session * session, uint8 rideIndex } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -180,9 +180,9 @@ static void stand_up_rc_track_60_deg_up(paint_session * session, uint8 rideIndex } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -229,9 +229,9 @@ static void stand_up_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -282,9 +282,9 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -335,9 +335,9 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up(paint_session * session, ui } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -384,9 +384,9 @@ static void stand_up_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -449,7 +449,7 @@ static void stand_up_rc_track_left_quarter_turn_5(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -532,10 +532,10 @@ static void stand_up_rc_track_left_quarter_turn_5(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -571,7 +571,7 @@ static void stand_up_rc_track_flat_to_left_bank(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -596,7 +596,7 @@ static void stand_up_rc_track_flat_to_right_bank(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -621,7 +621,7 @@ static void stand_up_rc_track_left_bank_to_flat(paint_session * session, uint8 r if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -646,7 +646,7 @@ static void stand_up_rc_track_right_bank_to_flat(paint_session * session, uint8 if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -673,7 +673,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(paint_session * session } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -757,10 +757,10 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -797,9 +797,9 @@ static void stand_up_rc_track_left_bank_to_25_deg_up(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -826,9 +826,9 @@ static void stand_up_rc_track_right_bank_to_25_deg_up(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -855,9 +855,9 @@ static void stand_up_rc_track_25_deg_up_to_left_bank(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -884,9 +884,9 @@ static void stand_up_rc_track_25_deg_up_to_right_bank(paint_session * session, u metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -936,7 +936,7 @@ static void stand_up_rc_track_left_bank(paint_session * session, uint8 rideIndex if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -986,7 +986,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1138,10 +1138,10 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1189,7 +1189,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1341,10 +1341,10 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1388,7 +1388,7 @@ static void stand_up_rc_track_s_bend_left(paint_session * session, uint8 rideInd } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1451,10 +1451,10 @@ static void stand_up_rc_track_s_bend_left(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1484,7 +1484,7 @@ static void stand_up_rc_track_s_bend_right(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1547,10 +1547,10 @@ static void stand_up_rc_track_s_bend_right(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -1580,7 +1580,7 @@ static void stand_up_rc_track_left_vertical_loop(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -1725,10 +1725,10 @@ static void stand_up_rc_track_left_vertical_loop(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1759,7 +1759,7 @@ static void stand_up_rc_track_right_vertical_loop(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -1897,10 +1897,10 @@ static void stand_up_rc_track_right_vertical_loop(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -1931,7 +1931,7 @@ static void stand_up_rc_track_left_quarter_turn_3(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1975,10 +1975,10 @@ static void stand_up_rc_track_left_quarter_turn_3(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2016,7 +2016,7 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2061,10 +2061,10 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(paint_session * session, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2119,7 +2119,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2166,10 +2166,10 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2217,7 +2217,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2270,10 +2270,10 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2317,7 +2317,7 @@ static void stand_up_rc_track_half_loop_up(paint_session * session, uint8 rideIn } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -2378,7 +2378,7 @@ static void stand_up_rc_track_half_loop_up(paint_session * session, uint8 rideIn break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2415,7 +2415,7 @@ static void stand_up_rc_track_left_corkscrew_up(paint_session * session, uint8 r track_paint_util_left_corkscrew_up_supports(session, direction, height); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2458,10 +2458,10 @@ static void stand_up_rc_track_left_corkscrew_up(paint_session * session, uint8 r switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2490,7 +2490,7 @@ static void stand_up_rc_track_right_corkscrew_up(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -2534,10 +2534,10 @@ static void stand_up_rc_track_right_corkscrew_up(paint_session * session, uint8 switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -2579,7 +2579,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2624,10 +2624,10 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2652,10 +2652,10 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2700,7 +2700,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2730,7 +2730,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2775,10 +2775,10 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2803,10 +2803,10 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2851,7 +2851,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2903,7 +2903,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2987,10 +2987,10 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3015,10 +3015,10 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(paint_session * se metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3102,7 +3102,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(paint_session * se } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3132,7 +3132,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3216,10 +3216,10 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3244,10 +3244,10 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(paint_session * s metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3331,7 +3331,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(paint_session * s } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3377,7 +3377,7 @@ static void stand_up_rc_track_brakes(paint_session * session, uint8 rideIndex, u if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -3412,7 +3412,7 @@ static void stand_up_rc_track_on_ride_photo(paint_session * session, uint8 rideI break; } track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -3438,7 +3438,7 @@ static void stand_up_rc_track_left_eighth_to_diag(paint_session * session, uint8 } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3529,7 +3529,7 @@ static void stand_up_rc_track_right_eighth_to_diag(paint_session * session, uint } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3634,7 +3634,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -3725,7 +3725,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(paint_session * session, } metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -5808,7 +5808,7 @@ static void stand_up_rc_track_block_brakes(paint_session * session, uint8 rideIn if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/steeplechase.c b/src/openrct2/ride/coaster/steeplechase.c index 826db8de01..2cbf5208be 100644 --- a/src/openrct2/ride/coaster/steeplechase.c +++ b/src/openrct2/ride/coaster/steeplechase.c @@ -56,7 +56,7 @@ static void steeplechase_track_flat(paint_session * session, uint8 rideIndex, ui break; } } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -74,7 +74,7 @@ static void steeplechase_track_station(paint_session * session, uint8 rideIndex, sub_98199C_rotated(direction, imageIds[direction][0] | gTrackColours[SCHEME_TRACK], 0, 6, 32, 20, 3, height, 0, 0, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 3); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -122,9 +122,9 @@ static void steeplechase_track_25_deg_up(paint_session * session, uint8 rideInde } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -173,9 +173,9 @@ static void steeplechase_track_flat_to_25_deg_up(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -224,9 +224,9 @@ static void steeplechase_track_25_deg_up_to_flat(paint_session * session, uint8 } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -274,7 +274,7 @@ static void steeplechase_track_left_quarter_turn_5(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -360,10 +360,10 @@ static void steeplechase_track_left_quarter_turn_5(paint_session * session, uint } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -403,7 +403,7 @@ static void steeplechase_track_s_bend_left(paint_session * session, uint8 rideIn break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -469,10 +469,10 @@ static void steeplechase_track_s_bend_left(paint_session * session, uint8 rideIn } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -505,7 +505,7 @@ static void steeplechase_track_s_bend_right(paint_session * session, uint8 rideI break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -571,10 +571,10 @@ static void steeplechase_track_s_bend_right(paint_session * session, uint8 rideI } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -607,7 +607,7 @@ static void steeplechase_track_left_quarter_turn_3(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -654,10 +654,10 @@ static void steeplechase_track_left_quarter_turn_3(paint_session * session, uint } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -688,7 +688,7 @@ static void steeplechase_track_brakes(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -717,7 +717,7 @@ static void steeplechase_track_left_eighth_to_diag(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -811,7 +811,7 @@ static void steeplechase_track_right_eighth_to_diag(paint_session * session, uin break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1573,7 +1573,7 @@ static void steeplechase_track_block_brakes(paint_session * session, uint8 rideI metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/suspended_swinging_coaster.c b/src/openrct2/ride/coaster/suspended_swinging_coaster.c index cf7416aee3..8165024c01 100644 --- a/src/openrct2/ride/coaster/suspended_swinging_coaster.c +++ b/src/openrct2/ride/coaster/suspended_swinging_coaster.c @@ -58,7 +58,7 @@ static void suspended_swinging_rc_track_flat(paint_session * session, uint8 ride metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -77,7 +77,7 @@ static void suspended_swinging_rc_track_station(paint_session * session, uint8 r sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6, height + 29); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_TALL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -136,9 +136,9 @@ static void suspended_swinging_rc_track_25_deg_up(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_5); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -161,9 +161,9 @@ static void suspended_swinging_rc_track_60_deg_up(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 120, 0x20); @@ -223,9 +223,9 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(paint_session * sessio } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_5); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -250,9 +250,9 @@ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 88, 0x20); @@ -316,9 +316,9 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(paint_session * s } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_5); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_5); } paint_util_set_general_support_height(height + 88, 0x20); } @@ -377,9 +377,9 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(paint_session * sessio } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_3); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_13); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_13); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -444,7 +444,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -529,10 +529,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(paint_session * sess switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -571,7 +571,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -656,10 +656,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(paint_sess switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -691,7 +691,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(paint_ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -776,10 +776,10 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(paint_ses switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -825,7 +825,7 @@ static void suspended_swinging_rc_track_s_bend_left(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -906,10 +906,10 @@ static void suspended_swinging_rc_track_s_bend_left(paint_session * session, uin switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -941,7 +941,7 @@ static void suspended_swinging_rc_track_s_bend_right(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1022,10 +1022,10 @@ static void suspended_swinging_rc_track_s_bend_right(paint_session * session, ui switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1057,7 +1057,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1103,10 +1103,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(paint_session * sess switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1145,7 +1145,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -1176,10 +1176,10 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(paint_sess switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -1211,7 +1211,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(paint_ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_4); } paint_util_set_general_support_height(height + 88, 0x20); break; @@ -1242,10 +1242,10 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(paint_ses switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_5); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_5); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_5); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_5); break; } paint_util_set_general_support_height(height + 88, 0x20); @@ -1286,7 +1286,7 @@ static void suspended_swinging_rc_track_brakes(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } @@ -1314,7 +1314,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(paint_sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1399,10 +1399,10 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(paint_sessio switch (direction) { case 2: - paint_util_push_tunnel_right(height + 16, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height + 16, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1434,7 +1434,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(paint_sessi metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1519,10 +1519,10 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(paint_sessi switch (direction) { case 0: - paint_util_push_tunnel_right(height + 16, TUNNEL_3); + paint_util_push_tunnel_right(session, height + 16, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height + 16, TUNNEL_3); + paint_util_push_tunnel_left(session, height + 16, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1554,7 +1554,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(paint_sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1639,10 +1639,10 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(paint_sess switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1674,7 +1674,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(paint_ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1759,10 +1759,10 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(paint_ses switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_3); + paint_util_push_tunnel_right(session, height, TUNNEL_3); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_3); + paint_util_push_tunnel_left(session, height, TUNNEL_3); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -1794,7 +1794,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(paint_session * sess metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -1899,7 +1899,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(paint_session * ses metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -2985,7 +2985,7 @@ static void suspended_swinging_rc_track_block_brakes(paint_session * session, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_3); paint_util_set_general_support_height(height + 48, 0x20); } diff --git a/src/openrct2/ride/coaster/virginia_reel.c b/src/openrct2/ride/coaster/virginia_reel.c index 417eeabce7..80bbc50a76 100644 --- a/src/openrct2/ride/coaster/virginia_reel.c +++ b/src/openrct2/ride/coaster/virginia_reel.c @@ -240,10 +240,10 @@ static void paint_virginia_reel_track_flat(paint_session * session, uint8 rideIn uint32 imageId = sprites[direction] | gTrackColours[SCHEME_TRACK]; if (direction & 1) { sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -276,19 +276,19 @@ static void paint_virginia_reel_track_25_deg_up(paint_session * session, uint8 r switch (direction) { case 0: wooden_a_supports_paint_setup(session, 0, 9, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; case 1: wooden_a_supports_paint_setup(session, 1, 10, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 2: wooden_a_supports_paint_setup(session, 0, 11, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; case 3: wooden_a_supports_paint_setup(session, 1, 12, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } @@ -311,27 +311,27 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(paint_session * session, sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); wooden_a_supports_paint_setup(session, 0, 1, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: ps = sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); session->WoodenSupportsPrependTo = ps; wooden_a_supports_paint_setup(session, 1, 2, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 2: ps = sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); session->WoodenSupportsPrependTo = ps; wooden_a_supports_paint_setup(session, 0, 3, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; case 3: sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); wooden_a_supports_paint_setup(session, 1, 4, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -363,19 +363,19 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(paint_session * session, switch (direction) { case 0: wooden_a_supports_paint_setup(session, 0, 5, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height - 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; case 1: wooden_a_supports_paint_setup(session, 1, 6, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height + 8, TUNNEL_14); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; case 2: wooden_a_supports_paint_setup(session, 0, 7, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height + 8, TUNNEL_14); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; case 3: wooden_a_supports_paint_setup(session, 1, 8, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height - 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } @@ -413,7 +413,7 @@ static void paint_virginia_reel_station(paint_session * session, uint8 rideIndex imageId = SPR_VIRGINIA_REEL_FLAT_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98199C(imageId, 0, 0, 32, 20, 2, height, 0, 0, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else if (direction == 1 || direction == 3) { imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC]; sub_98197C(imageId, 0, 0, 28, 32, 2, height - 2, 2, 0, height, get_current_rotation()); @@ -421,7 +421,7 @@ static void paint_virginia_reel_station(paint_session * session, uint8 rideIndex imageId = SPR_VIRGINIA_REEL_FLAT_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98199C(imageId, 0, 0, 20, 32, 2, height, 0, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -470,19 +470,19 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile(paint_session * s switch (direction) { case 0: wooden_a_supports_paint_setup(session, 5, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: wooden_a_supports_paint_setup(session, 2, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: wooden_a_supports_paint_setup(session, 3, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: wooden_a_supports_paint_setup(session, 4, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_6); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } diff --git a/src/openrct2/ride/coaster/wild_mouse.c b/src/openrct2/ride/coaster/wild_mouse.c index 8d4e8eec8a..312e7e33cc 100644 --- a/src/openrct2/ride/coaster/wild_mouse.c +++ b/src/openrct2/ride/coaster/wild_mouse.c @@ -185,7 +185,7 @@ static void wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -208,7 +208,7 @@ static void wild_mouse_track_station(paint_session * session, uint8 rideIndex, u } track_paint_util_draw_station_metal_supports(session, direction, height, gTrackColours[SCHEME_SUPPORTS]); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -230,9 +230,9 @@ static void wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -263,9 +263,9 @@ static void wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex, } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -288,9 +288,9 @@ static void wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -4, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -325,9 +325,9 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -13, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -362,9 +362,9 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(paint_session * session, uin metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -21, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -387,9 +387,9 @@ static void wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -7, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -664,9 +664,9 @@ static void wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -5, height, gTrackColours[SCHEME_SUPPORTS]); } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -705,9 +705,9 @@ static void wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 ri } } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -733,7 +733,7 @@ static void wild_mouse_track_brakes(paint_session * session, uint8 rideIndex, ui if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -753,7 +753,7 @@ static void wild_mouse_track_rotation_control_toggle(paint_session * session, ui if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -766,7 +766,7 @@ static void wild_mouse_track_block_brakes(paint_session * session, uint8 rideInd if (track_paint_util_should_paint_supports(session->MapPosition)) { metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/wooden_roller_coaster.c b/src/openrct2/ride/coaster/wooden_roller_coaster.c index 091f774780..15dfe5e061 100644 --- a/src/openrct2/ride/coaster/wooden_roller_coaster.c +++ b/src/openrct2/ride/coaster/wooden_roller_coaster.c @@ -451,7 +451,7 @@ static void wooden_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 uint8 isChained = track_element_is_lift_hill(mapElement) ? 1 : 0; wooden_rc_track_paint(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, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -477,7 +477,7 @@ static void wooden_rc_track_station(paint_session * session, uint8 rideIndex, ui } wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); track_paint_util_draw_station_2(session, rideIndex, trackSequence, direction, height, mapElement, 9, 11); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -508,9 +508,9 @@ static void wooden_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -535,9 +535,9 @@ static void wooden_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -570,9 +570,9 @@ static void wooden_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rid wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -598,9 +598,9 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -626,9 +626,9 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -661,9 +661,9 @@ static void wooden_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rid wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -836,7 +836,7 @@ static void wooden_rc_track_flat_to_left_bank(paint_session * session, uint8 rid wooden_rc_track_paint(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, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -856,7 +856,7 @@ static void wooden_rc_track_flat_to_right_bank(paint_session * session, uint8 ri wooden_rc_track_paint(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, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -1004,9 +1004,9 @@ static void wooden_rc_track_left_bank_to_25_deg_up(paint_session * session, uint } wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1028,9 +1028,9 @@ static void wooden_rc_track_right_bank_to_25_deg_up(paint_session * session, uin } wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -1052,9 +1052,9 @@ static void wooden_rc_track_25_deg_up_to_left_bank(paint_session * session, uint } wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1076,9 +1076,9 @@ static void wooden_rc_track_25_deg_up_to_right_bank(paint_session * session, uin } wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -1120,7 +1120,7 @@ static void wooden_rc_track_left_bank(paint_session * session, uint8 rideIndex, wooden_rc_track_paint(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, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -1161,7 +1161,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1297,10 +1297,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1339,7 +1339,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -1475,10 +1475,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1533,7 +1533,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1627,10 +1627,10 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1671,7 +1671,7 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1765,10 +1765,10 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde } switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1798,7 +1798,7 @@ static void wooden_rc_track_left_vertical_loop(paint_session * session, uint8 ri } metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -1943,10 +1943,10 @@ static void wooden_rc_track_left_vertical_loop(paint_session * session, uint8 ri metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -1976,7 +1976,7 @@ static void wooden_rc_track_right_vertical_loop(paint_session * session, uint8 r } metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_general_support_height(height + 56, 0x20); break; @@ -2114,10 +2114,10 @@ static void wooden_rc_track_right_vertical_loop(paint_session * session, uint8 r metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); switch (direction) { case 1: - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; case 2: - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; } paint_util_set_general_support_height(height + 56, 0x20); @@ -2159,7 +2159,7 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2222,10 +2222,10 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2273,7 +2273,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -2336,10 +2336,10 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2387,7 +2387,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2430,10 +2430,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2474,7 +2474,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -2517,10 +2517,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -2575,7 +2575,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -2653,10 +2653,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -2692,10 +2692,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -2773,7 +2773,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2814,7 +2814,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -2892,10 +2892,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -2931,10 +2931,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -3012,7 +3012,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3075,7 +3075,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3209,10 +3209,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -3248,10 +3248,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -3385,7 +3385,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3426,7 +3426,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -3560,10 +3560,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20); @@ -3599,10 +3599,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20); @@ -3736,7 +3736,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -3859,7 +3859,7 @@ static void wooden_rc_track_brakes(paint_session * session, uint8 rideIndex, uin wooden_rc_track_paint(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, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -3894,9 +3894,9 @@ static void wooden_rc_track_25_deg_up_left_banked(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -3932,9 +3932,9 @@ static void wooden_rc_track_25_deg_up_right_banked(paint_session * session, uint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -3963,7 +3963,7 @@ static void wooden_rc_track_on_ride_photo(paint_session * session, uint8 rideInd } wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); track_paint_util_onride_photo_small_paint(session, direction, height + 16, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -4028,7 +4028,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde break; } wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); break; @@ -4199,7 +4199,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde break; } wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height + 16, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); break; @@ -4238,7 +4238,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4382,7 +4382,7 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4540,7 +4540,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -4684,7 +4684,7 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -7164,7 +7164,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -7207,10 +7207,10 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -7251,7 +7251,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -7294,10 +7294,10 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -7340,7 +7340,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -7381,10 +7381,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s } switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -7427,7 +7427,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 64, 0x20); @@ -7468,10 +7468,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint } switch (direction) { case 0: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -7487,7 +7487,7 @@ static void wooden_rc_track_block_brakes(paint_session * session, uint8 rideInde _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, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -7524,7 +7524,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -7567,10 +7567,10 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -7611,7 +7611,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -7654,10 +7654,10 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -7710,7 +7710,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -7846,10 +7846,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * } switch (direction) { case 2: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 3: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -7888,7 +7888,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -8024,10 +8024,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session } switch (direction) { case 0: - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 1: - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -8076,9 +8076,9 @@ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -8110,9 +8110,9 @@ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -8144,9 +8144,9 @@ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * s break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -8178,9 +8178,9 @@ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -8240,9 +8240,9 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -8278,9 +8278,9 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -8316,9 +8316,9 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -8354,9 +8354,9 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -8416,9 +8416,9 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -8454,9 +8454,9 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -8492,9 +8492,9 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -8530,9 +8530,9 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi break; } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); diff --git a/src/openrct2/ride/coaster/wooden_wild_mouse.c b/src/openrct2/ride/coaster/wooden_wild_mouse.c index 4fc8b82476..ae8cea744e 100644 --- a/src/openrct2/ride/coaster/wooden_wild_mouse.c +++ b/src/openrct2/ride/coaster/wooden_wild_mouse.c @@ -140,7 +140,7 @@ static void wooden_wild_mouse_track_flat(paint_session * session, uint8 rideInde uint32 imageId = imageIds[direction] | gTrackColours[SCHEME_TRACK]; sub_98196C_rotated(direction, imageId, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C8 | SEGMENT_D4, direction), height, 0x20); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -159,7 +159,7 @@ static void wooden_wild_mouse_track_station(paint_session * session, uint8 rideI sub_98199C_rotated(direction, imageIds[direction][0] | gTrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 0, height); wooden_a_supports_paint_setup(session, direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -189,9 +189,9 @@ static void wooden_wild_mouse_track_25_deg_up(paint_session * session, uint8 rid wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -227,9 +227,9 @@ static void wooden_wild_mouse_track_60_deg_up(paint_session * session, uint8 rid wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -261,9 +261,9 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(paint_session * session, u wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -303,9 +303,9 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * sessi wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -344,9 +344,9 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(paint_session * session, wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -378,9 +378,9 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(paint_session * session, u wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -545,9 +545,9 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(paint_session * session, u wooden_a_supports_paint_setup(session, direction & 1, 29 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -587,9 +587,9 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(paint_session * session, u wooden_a_supports_paint_setup(session, direction & 1, 33 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_0); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); diff --git a/src/openrct2/ride/gentle/car_ride.c b/src/openrct2/ride/gentle/car_ride.c index fa455d76bd..2902569194 100644 --- a/src/openrct2/ride/gentle/car_ride.c +++ b/src/openrct2/ride/gentle/car_ride.c @@ -173,9 +173,9 @@ static void paint_car_ride_track_flat(paint_session * session, uint8 rideIndex, } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } else { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); @@ -196,16 +196,16 @@ static void paint_car_ride_track_25_deg_up(paint_session * session, uint8 rideIn switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -227,16 +227,16 @@ static void paint_car_ride_track_flat_to_25_deg_up(paint_session * session, uint switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_right(height, TUNNEL_2); + paint_util_push_tunnel_right(session, height, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_2); + paint_util_push_tunnel_left(session, height, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; } @@ -258,16 +258,16 @@ static void paint_car_ride_track_25_deg_up_to_flat(paint_session * session, uint switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_12); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_12); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_12); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_12); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_0); break; } @@ -315,9 +315,9 @@ static void paint_car_ride_station(paint_session * session, uint8 rideIndex, uin } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } if (direction == 0 || direction == 2) { @@ -406,9 +406,9 @@ static void paint_car_ride_track_spinning_tunnel(paint_session * session, uint8 track_paint_util_spinning_tunnel_paint(session, 1, height, direction, get_current_rotation()); if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } else { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL); @@ -441,16 +441,16 @@ static void paint_car_ride_track_60_deg_up(paint_session * session, uint8 rideIn switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 56, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 56, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 56, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 56, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -488,16 +488,16 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up(paint_session * session, switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -534,16 +534,16 @@ static void paint_car_ride_track_60_deg_up_to_25_deg_up(paint_session * session, switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 24, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 24, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 24, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 24, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -585,9 +585,9 @@ static void paint_car_ride_track_log_bumps(paint_session * session, uint8 rideIn } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } else { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); diff --git a/src/openrct2/ride/gentle/ghost_train.c b/src/openrct2/ride/gentle/ghost_train.c index ed44097d08..c70ac3a36f 100644 --- a/src/openrct2/ride/gentle/ghost_train.c +++ b/src/openrct2/ride/gentle/ghost_train.c @@ -160,9 +160,9 @@ static void paint_ghost_train_track_flat(paint_session * session, uint8 rideInde } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } else { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (track_paint_util_should_paint_supports(position)) { @@ -199,16 +199,16 @@ static void paint_ghost_train_track_25_deg_up(paint_session * session, uint8 rid switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -241,16 +241,16 @@ static void paint_ghost_train_track_flat_to_25_deg_up(paint_session * session, u switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; case 1: - paint_util_push_tunnel_right(height, TUNNEL_2); + paint_util_push_tunnel_right(session, height, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_2); + paint_util_push_tunnel_left(session, height, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; } @@ -290,10 +290,10 @@ static void paint_ghost_train_track_25_deg_up_to_flat(paint_session * session, u paint_ghost_train_track_25_deg_up_to_flat_shared(session, rideIndex, trackSequence, direction, height, mapElement); switch (direction) { - case 0: paint_util_push_tunnel_left(height - 8, TUNNEL_0); break; - case 1: paint_util_push_tunnel_right(height + 8, TUNNEL_12); break; - case 2: paint_util_push_tunnel_left(height + 8, TUNNEL_12); break; - case 3: paint_util_push_tunnel_right(height - 8, TUNNEL_0); break; + case 0: paint_util_push_tunnel_left(session, height - 8, TUNNEL_0); break; + case 1: paint_util_push_tunnel_right(session, height + 8, TUNNEL_12); break; + case 2: paint_util_push_tunnel_left(session, height + 8, TUNNEL_12); break; + case 3: paint_util_push_tunnel_right(session, height - 8, TUNNEL_0); break; } } @@ -309,10 +309,10 @@ static void paint_ghost_train_track_flat_to_25_deg_down(paint_session * session, paint_ghost_train_track_25_deg_up_to_flat_shared(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); switch ((direction + 2) % 4) { - case 0: paint_util_push_tunnel_left(height - 8, TUNNEL_0); break; - case 1: paint_util_push_tunnel_right(height + 8, TUNNEL_0); break; - case 2: paint_util_push_tunnel_left(height + 8, TUNNEL_0); break; - case 3: paint_util_push_tunnel_right(height - 8, TUNNEL_0); break; + case 0: paint_util_push_tunnel_left(session, height - 8, TUNNEL_0); break; + case 1: paint_util_push_tunnel_right(session, height + 8, TUNNEL_0); break; + case 2: paint_util_push_tunnel_left(session, height + 8, TUNNEL_0); break; + case 3: paint_util_push_tunnel_right(session, height - 8, TUNNEL_0); break; } } @@ -343,9 +343,9 @@ static void paint_ghost_train_station(paint_session * session, uint8 rideIndex, } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } if (direction == 0 || direction == 2) { @@ -424,9 +424,9 @@ static void paint_ghost_train_track_spinning_tunnel(paint_session * session, uin track_paint_util_spinning_tunnel_paint(session, 3, height, direction, get_current_rotation()); if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } else { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL); @@ -449,9 +449,9 @@ static void paint_ghost_train_track_brakes(paint_session * session, uint8 rideIn } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } else { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (track_paint_util_should_paint_supports(position)) { diff --git a/src/openrct2/ride/gentle/mini_golf.c b/src/openrct2/ride/gentle/mini_golf.c index dcbc2e690d..eb7dca6ca8 100644 --- a/src/openrct2/ride/gentle/mini_golf.c +++ b/src/openrct2/ride/gentle/mini_golf.c @@ -468,11 +468,11 @@ static void paint_mini_golf_track_flat(paint_session * session, uint8 rideIndex, if (direction & 1) { imageId = SPR_MINI_GOLF_FLAT_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 1, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); } else { imageId = SPR_MINI_GOLF_FLAT_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); } metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); @@ -516,16 +516,16 @@ static void paint_mini_golf_track_25_deg_up(paint_session * session, uint8 rideI switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -551,16 +551,16 @@ static void paint_mini_golf_track_flat_to_25_deg_up(paint_session * session, uin switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); break; case 1: - paint_util_push_tunnel_right(height, TUNNEL_2); + paint_util_push_tunnel_right(session, height, TUNNEL_2); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_2); + paint_util_push_tunnel_left(session, height, TUNNEL_2); break; case 3: - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); break; } @@ -586,16 +586,16 @@ static void paint_mini_golf_track_25_deg_up_to_flat(paint_session * session, uin switch (direction) { case 0: - paint_util_push_tunnel_left(height - 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_0); break; case 1: - paint_util_push_tunnel_right(height + 8, TUNNEL_10); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_10); break; case 2: - paint_util_push_tunnel_left(height + 8, TUNNEL_10); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_10); break; case 3: - paint_util_push_tunnel_right(height - 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_0); break; } @@ -649,7 +649,7 @@ static void paint_mini_golf_station(paint_session * session, uint8 rideIndex, ui track_paint_util_draw_station_covers(session, EDGE_SW, hasSWFence, entranceStyle, direction, height); // Was leftwards tunnel in game, seems odd - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { hasFence = track_paint_util_has_fence(EDGE_NW, position, mapElement, ride, get_current_rotation()); if (hasFence) { @@ -666,7 +666,7 @@ static void paint_mini_golf_station(paint_session * session, uint8 rideIndex, ui track_paint_util_draw_station_covers(session, EDGE_NW, hasFence, entranceStyle, direction, height); track_paint_util_draw_station_covers(session, EDGE_SE, hasSEFence, entranceStyle, direction, height); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -690,7 +690,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(paint_session * sessi switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); if (!shouldDrawFence) break; imageId = SPR_MINI_GOLF_QUARTER_TURN_1_TILE_FENCE_BACK_SW_NW | gTrackColours[SCHEME_MISC]; @@ -706,7 +706,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(paint_session * sessi break; case 2: - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); if (!shouldDrawFence) break; imageId = SPR_MINI_GOLF_QUARTER_TURN_1_TILE_FENCE_BACK_NE_SE | gTrackColours[SCHEME_MISC]; @@ -714,8 +714,8 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(paint_session * sessi break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_10); - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); if (!shouldDrawFence) break; imageId = SPR_MINI_GOLF_QUARTER_TURN_1_TILE_FENCE_BACK_SE_SW | gTrackColours[SCHEME_MISC]; @@ -758,9 +758,9 @@ static void paint_mini_golf_hole_ab(paint_session * session, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); if ((direction == 0 && trackSequence == 0) || (direction == 2 && trackSequence == 1)) { - paint_util_push_tunnel_left(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); } else if ((direction == 3 && trackSequence == 0) || (direction == 1 && trackSequence == 1)) { - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); } rct_xy16 boundBox = (direction & 1) ? (rct_xy16) {26, 32} : (rct_xy16) {32, 26}; @@ -804,9 +804,9 @@ static void paint_mini_golf_hole_c(paint_session * session, uint8 rideIndex, uin paint_util_set_general_support_height(height + 32, 0x20); if ((direction == 0 && trackSequence == 0) || (direction == 2 && trackSequence == 1)) { - paint_util_push_tunnel_left(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); } else if ((direction == 3 && trackSequence == 0) || (direction == 1 && trackSequence == 1)) { - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); } rct_xy16 boundBox = (direction & 1) ? (rct_xy16) {26, 32} : (rct_xy16) {32, 26}; @@ -855,12 +855,12 @@ static void paint_mini_golf_hole_d(paint_session * session, uint8 rideIndex, uin switch ((direction << 4) | trackSequence) { case 0x00: case 0x12: - paint_util_push_tunnel_left(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); break; case 0x02: case 0x30: - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); break; } @@ -921,12 +921,12 @@ static void paint_mini_golf_hole_e(paint_session * session, uint8 rideIndex, uin switch ((direction << 4) | trackSequence) { case 0x00: case 0x12: - paint_util_push_tunnel_left(height, TUNNEL_10); + paint_util_push_tunnel_left(session, height, TUNNEL_10); break; case 0x02: case 0x30: - paint_util_push_tunnel_right(height, TUNNEL_10); + paint_util_push_tunnel_right(session, height, TUNNEL_10); break; } diff --git a/src/openrct2/ride/gentle/mini_helicopters.c b/src/openrct2/ride/gentle/mini_helicopters.c index 2d160c8484..ccc92e39ee 100644 --- a/src/openrct2/ride/gentle/mini_helicopters.c +++ b/src/openrct2/ride/gentle/mini_helicopters.c @@ -37,7 +37,7 @@ static void paint_mini_helicopters_track_station(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else if (direction == 1 || direction == 3) { imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC]; sub_98197C(imageId, 0, 0, 28, 32, 1, height - 2, 2, 0, height, get_current_rotation()); @@ -47,7 +47,7 @@ static void paint_mini_helicopters_track_station(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); @@ -65,11 +65,11 @@ static void paint_mini_helicopters_track_flat(paint_session * session, uint8 rid if (direction & 1) { imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (track_paint_util_should_paint_supports(position)) { @@ -90,22 +90,22 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(paint_session * sessi case 0: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_TO_25_DEG_UP_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); break; case 1: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_TO_25_DEG_UP_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_2); + paint_util_push_tunnel_right(session, height, TUNNEL_2); break; case 2: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_TO_25_DEG_UP_NE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_2); + paint_util_push_tunnel_left(session, height, TUNNEL_2); break; case 3: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_TO_25_DEG_UP_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); break; } @@ -127,22 +127,22 @@ static void paint_mini_helicopters_track_25_deg_up(paint_session * session, uint case 0: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height - 8, TUNNEL_1); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_1); break; case 1: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height + 8, TUNNEL_2); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_2); break; case 2: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_NE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height + 8, TUNNEL_2); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_2); break; case 3: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height - 8, TUNNEL_1); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_1); break; } @@ -164,22 +164,22 @@ static void paint_mini_helicopters_track_25_deg_up_to_flat(paint_session * sessi case 0: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_TO_FLAT_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height - 8, TUNNEL_0); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_0); break; case 1: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_TO_FLAT_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height + 8, TUNNEL_12); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_12); break; case 2: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_TO_FLAT_NE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); - paint_util_push_tunnel_left(height + 8, TUNNEL_12); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_12); break; case 3: imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_TO_FLAT_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); - paint_util_push_tunnel_right(height - 8, TUNNEL_0); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_0); break; } diff --git a/src/openrct2/ride/gentle/monorail_cycles.c b/src/openrct2/ride/gentle/monorail_cycles.c index 1d05b3e43d..566ecafba5 100644 --- a/src/openrct2/ride/gentle/monorail_cycles.c +++ b/src/openrct2/ride/gentle/monorail_cycles.c @@ -190,9 +190,9 @@ static void paint_monorail_cycles_track_flat(paint_session * session, uint8 ride paint_monorail_cycles_util_7c((bool) (direction & 1), imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } metal_a_supports_paint_setup(session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); @@ -215,7 +215,7 @@ static void paint_monorail_cycles_station(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else if (direction == 1 || direction == 3) { imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC]; sub_98197C(imageId, 0, 0, 28, 32, 1, height - 2, 2, 0, height, get_current_rotation()); @@ -225,7 +225,7 @@ static void paint_monorail_cycles_station(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); @@ -309,19 +309,19 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(paint_session } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -359,7 +359,7 @@ static void paint_monorail_cycles_track_s_bend_left(paint_session * session, uin if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } switch (trackSequence) { @@ -369,7 +369,7 @@ static void paint_monorail_cycles_track_s_bend_left(paint_session * session, uin } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -405,7 +405,7 @@ static void paint_monorail_cycles_track_s_bend_right(paint_session * session, ui if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } switch (trackSequence) { @@ -415,7 +415,7 @@ static void paint_monorail_cycles_track_s_bend_right(paint_session * session, ui } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { diff --git a/src/openrct2/ride/gentle/observation_tower.c b/src/openrct2/ride/gentle/observation_tower.c index 6dad4a3106..e61dedda4d 100644 --- a/src/openrct2/ride/gentle/observation_tower.c +++ b/src/openrct2/ride/gentle/observation_tower.c @@ -94,7 +94,7 @@ static void paint_observation_tower_base(paint_session * session, uint8 rideInde imageId = SPR_OBSERVATION_TOWER_SEGMENT | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 2, 2, 30, height + 64, 8, 8, height + 64, get_current_rotation()); - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); #ifdef __TESTPAINT__ @@ -140,7 +140,7 @@ static void paint_observation_tower_section(paint_session * session, uint8 rideI paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/thrill/go_karts.c b/src/openrct2/ride/thrill/go_karts.c index 9f06ae5f15..dd5db39bfb 100644 --- a/src/openrct2/ride/thrill/go_karts.c +++ b/src/openrct2/ride/thrill/go_karts.c @@ -141,7 +141,7 @@ static void paint_go_karts_track_flat(paint_session * session, uint8 rideIndex, imageId = SPR_GO_KARTS_FLAT_FRONT_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 1, 3, height, 0, 29, height + 2, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else { imageId = SPR_GO_KARTS_FLAT_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 28, 32, 1, height, 2, 0, height, get_current_rotation()); @@ -149,7 +149,7 @@ static void paint_go_karts_track_flat(paint_session * session, uint8 rideIndex, imageId = SPR_GO_KARTS_FLAT_FRONT_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 32, 3, height, 29, 0, height + 2, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -183,19 +183,19 @@ static void paint_go_karts_track_25_deg_up(paint_session * session, uint8 rideIn switch (direction) { case 0: wooden_a_supports_paint_setup(session, 0, 9, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; case 1: wooden_a_supports_paint_setup(session, 1, 10, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 2: wooden_a_supports_paint_setup(session, 0, 11, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; case 3: wooden_a_supports_paint_setup(session, 1, 12, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } @@ -228,19 +228,19 @@ static void paint_go_karts_track_flat_to_25_deg_up(paint_session * session, uint switch (direction) { case 0: wooden_a_supports_paint_setup(session, 0, 1, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: wooden_a_supports_paint_setup(session, 1, 2, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 2: wooden_a_supports_paint_setup(session, 0, 3, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; case 3: wooden_a_supports_paint_setup(session, 1, 4, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -273,19 +273,19 @@ static void paint_go_karts_track_25_deg_up_to_flat(paint_session * session, uint switch (direction) { case 0: wooden_a_supports_paint_setup(session, 0, 5, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height - 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; case 1: wooden_a_supports_paint_setup(session, 1, 6, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height + 8, TUNNEL_14); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; case 2: wooden_a_supports_paint_setup(session, 0, 7, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height + 8, TUNNEL_14); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; case 3: wooden_a_supports_paint_setup(session, 1, 8, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height - 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } @@ -345,11 +345,11 @@ static void paint_go_karts_station(paint_session * session, uint8 rideIndex, uin if (direction == 0 || direction == 2) { sub_98197C(imageId, 0, 0, 32, 1, 3, height, 0, 29, height + 2, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else { sub_98197C(imageId, 0, 0, 1, 32, 3, height, 29, 0, height + 2, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } if (direction == 0 || direction == 2) { @@ -450,14 +450,14 @@ static void paint_go_karts_track_left_quarter_turn_1_tile(paint_session * sessio switch (direction) { case 0: - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 2: - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_6); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } diff --git a/src/openrct2/ride/thrill/launched_freefall.c b/src/openrct2/ride/thrill/launched_freefall.c index e2960bc85e..71710e48df 100644 --- a/src/openrct2/ride/thrill/launched_freefall.c +++ b/src/openrct2/ride/thrill/launched_freefall.c @@ -111,7 +111,7 @@ static void paint_launched_freefall_base(paint_session * session, uint8 rideInde imageId = SPR_LAUNCHED_FREEFALL_TOWER_SEGMENT | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 2, 2, 30, height, 8, 8, height, get_current_rotation()); - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); height -= 64; } @@ -151,7 +151,7 @@ static void paint_launched_freefall_tower_section(paint_session * session, uint8 paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/thrill/roto_drop.c b/src/openrct2/ride/thrill/roto_drop.c index 6dafc8caa2..e54fd4c754 100644 --- a/src/openrct2/ride/thrill/roto_drop.c +++ b/src/openrct2/ride/thrill/roto_drop.c @@ -109,7 +109,7 @@ static void paint_roto_drop_base(paint_session * session, uint8 rideIndex, uint8 imageId = (direction & 1 ? SPR_ROTO_DROP_TOWER_BASE_SEGMENT_90_DEG : SPR_ROTO_DROP_TOWER_BASE_SEGMENT) | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 2, 2, 30, height + 64, 8, 8, height + 64, get_current_rotation()); - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); #ifdef __TESTPAINT__ @@ -155,7 +155,7 @@ static void paint_roto_drop_tower_section(paint_session * session, uint8 rideInd paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index 43fef27fca..69fde8333d 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -1229,16 +1229,16 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_3(paint_session * session void track_paint_util_right_quarter_turn_5_tiles_tunnel(paint_session * session, sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType) { if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, tunnelType); + paint_util_push_tunnel_left(session, height, tunnelType); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, tunnelType); + paint_util_push_tunnel_right(session, height, tunnelType); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, tunnelType); + paint_util_push_tunnel_left(session, height, tunnelType); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, tunnelType); + paint_util_push_tunnel_right(session, height, tunnelType); } } @@ -1421,53 +1421,53 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_4(paint_session * session void track_paint_util_right_quarter_turn_3_tiles_tunnel(paint_session * session, sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType) { if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, tunnelType); + paint_util_push_tunnel_left(session, height, tunnelType); } if (direction == 0 && trackSequence == 3) { - paint_util_push_tunnel_right(height, tunnelType); + paint_util_push_tunnel_right(session, height, tunnelType); } if (direction == 1 && trackSequence == 3) { - paint_util_push_tunnel_left(height, tunnelType); + paint_util_push_tunnel_left(session, height, tunnelType); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, tunnelType); + paint_util_push_tunnel_right(session, height, tunnelType); } } void track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(paint_session * session, sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3) { if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height - 8, tunnelType0); + paint_util_push_tunnel_left(session, height - 8, tunnelType0); } if (direction == 0 && trackSequence == 3) { - paint_util_push_tunnel_right(height + 8, tunnelType3); + paint_util_push_tunnel_right(session, height + 8, tunnelType3); } if (direction == 1 && trackSequence == 3) { - paint_util_push_tunnel_left(height + 8, tunnelType3); + paint_util_push_tunnel_left(session, height + 8, tunnelType3); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height - 8, tunnelType0); + paint_util_push_tunnel_right(session, height - 8, tunnelType0); } } void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(paint_session * session, sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3) { if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height + 8, tunnelType0); + paint_util_push_tunnel_left(session, height + 8, tunnelType0); } if (direction == 0 && trackSequence == 3) { - paint_util_push_tunnel_right(height - 8, tunnelType3); + paint_util_push_tunnel_right(session, height - 8, tunnelType3); } if (direction == 1 && trackSequence == 3) { - paint_util_push_tunnel_left(height - 8, tunnelType3); + paint_util_push_tunnel_left(session, height - 8, tunnelType3); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height + 8, tunnelType0); + paint_util_push_tunnel_right(session, height + 8, tunnelType0); } } @@ -1541,21 +1541,21 @@ void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(paint_s void track_paint_util_left_quarter_turn_3_tiles_tunnel(paint_session * session, sint16 height, uint8 tunnelType, uint8 direction, uint8 trackSequence) { if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, tunnelType); + paint_util_push_tunnel_left(session, height, tunnelType); } if (direction == 2 && trackSequence == 3) { - paint_util_push_tunnel_right(height, tunnelType); + paint_util_push_tunnel_right(session, height, tunnelType); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, tunnelType); + paint_util_push_tunnel_right(session, height, tunnelType); } if (direction == 3 && trackSequence == 3) { - paint_util_push_tunnel_left(height, tunnelType); + paint_util_push_tunnel_left(session, height, tunnelType); } } @@ -1582,14 +1582,14 @@ void track_paint_util_left_quarter_turn_1_tile_tunnel(paint_session * session, u { switch (direction) { case 0: - paint_util_push_tunnel_left(baseHeight + startOffset, startTunnel); + paint_util_push_tunnel_left(session, baseHeight + startOffset, startTunnel); break; case 2: - paint_util_push_tunnel_right(baseHeight + endOffset, endTunnel); + paint_util_push_tunnel_right(session, baseHeight + endOffset, endTunnel); break; case 3: - paint_util_push_tunnel_right(baseHeight + startOffset, startTunnel); - paint_util_push_tunnel_left(baseHeight + endOffset, endTunnel); + paint_util_push_tunnel_right(session, baseHeight + startOffset, startTunnel); + paint_util_push_tunnel_left(session, baseHeight + endOffset, endTunnel); break; } } diff --git a/src/openrct2/ride/transport/chairlift.c b/src/openrct2/ride/transport/chairlift.c index 2fc3d2c1bb..9bbae96e1a 100644 --- a/src/openrct2/ride/transport/chairlift.c +++ b/src/openrct2/ride/transport/chairlift.c @@ -239,7 +239,7 @@ static void chairlift_paint_station_ne_sw(paint_session * session, uint8 rideInd } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); paint_util_set_general_support_height(height + 32, 0x20); } @@ -316,7 +316,7 @@ static void chairlift_paint_station_se_nw(paint_session * session, uint8 rideInd imageId = SPR_CHAIRLIFT_STATION_COLUMN_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 16, 30, 1, 1, 7, height + 2, 16, 1, height + 2, get_current_rotation()); // bound offset x is wrong? - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -339,11 +339,11 @@ static void chairlift_paint_flat(paint_session * session, uint8 rideIndex, uint8 if (direction & 1) { imageId = SPR_CHAIRLIFT_CABLE_FLAT_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 6, 32, 2, height, 13, 0, height + 28, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { imageId = SPR_CHAIRLIFT_CABLE_FLAT_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 6, 2, height, 0, 13, height + 28, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -359,25 +359,25 @@ static void chairlift_paint_25_deg_up(paint_session * session, uint8 rideIndex, case 0: imageId = SPR_CHAIRLIFT_CABLE_UP_SW_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 6, 2, height, 0, 13, height + 28, get_current_rotation()); - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; case 1: imageId = SPR_CHAIRLIFT_CABLE_UP_NW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 6, 32, 2, height, 13, 0, height + 28, get_current_rotation()); - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 2: imageId = SPR_CHAIRLIFT_CABLE_UP_NE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 6, 2, height, 0, 13, height + 28, get_current_rotation()); - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; case 3: imageId = SPR_CHAIRLIFT_CABLE_UP_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 6, 32, 2, height, 13, 0, height + 28, get_current_rotation()); - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } @@ -398,7 +398,7 @@ static void chairlift_paint_flat_to_25_deg_up(paint_session * session, uint8 rid imageId = SPR_20520 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: @@ -408,7 +408,7 @@ static void chairlift_paint_flat_to_25_deg_up(paint_session * session, uint8 rid imageId = SPR_20521 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 2: @@ -418,7 +418,7 @@ static void chairlift_paint_flat_to_25_deg_up(paint_session * session, uint8 rid imageId = SPR_20522 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; case 3: @@ -428,7 +428,7 @@ static void chairlift_paint_flat_to_25_deg_up(paint_session * session, uint8 rid imageId = SPR_20523 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -450,7 +450,7 @@ static void chairlift_paint_25_deg_up_to_flat(paint_session * session, uint8 rid imageId = SPR_20524 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_left(height - 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; case 1: @@ -460,7 +460,7 @@ static void chairlift_paint_25_deg_up_to_flat(paint_session * session, uint8 rid imageId = SPR_20525 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_right(height + 8, TUNNEL_14); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; case 2: @@ -470,7 +470,7 @@ static void chairlift_paint_25_deg_up_to_flat(paint_session * session, uint8 rid imageId = SPR_20526 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_left(height + 8, TUNNEL_14); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; case 3: @@ -480,7 +480,7 @@ static void chairlift_paint_25_deg_up_to_flat(paint_session * session, uint8 rid imageId = SPR_20527 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 4, 4, 25, height, 14, 14, height + 1, get_current_rotation()); - paint_util_push_tunnel_right(height - 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } @@ -524,7 +524,7 @@ static void chairlift_paint_left_quarter_turn_1_tile(paint_session * session, ui imageId = SPR_20536 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 2, 2, 27, height, 28, 4, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: @@ -548,7 +548,7 @@ static void chairlift_paint_left_quarter_turn_1_tile(paint_session * session, ui imageId = SPR_20538 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 2, 2, 27, height, 16, 28, height, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: @@ -561,8 +561,8 @@ static void chairlift_paint_left_quarter_turn_1_tile(paint_session * session, ui imageId = SPR_20539 | gTrackColours[SCHEME_SUPPORTS]; sub_98197C(imageId, 0, 0, 2, 2, 27, height, 16, 28, height, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } diff --git a/src/openrct2/ride/transport/lift.c b/src/openrct2/ride/transport/lift.c index b05e769e80..e0889ead77 100644 --- a/src/openrct2/ride/transport/lift.c +++ b/src/openrct2/ride/transport/lift.c @@ -65,7 +65,7 @@ static void paint_lift_base(paint_session * session, uint8 rideIndex, uint8 trac paint_lift_cage(-1, gTrackColours[SCHEME_TRACK], height + 64, get_current_rotation()); - paint_util_set_vertical_tunnel(height + 96); + paint_util_set_vertical_tunnel(session, height + 96); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); #ifdef __TESTPAINT__ @@ -113,7 +113,7 @@ static void paint_lift_tower_section(paint_session * session, uint8 rideIndex, u paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); - paint_util_set_vertical_tunnel(height + 32); + paint_util_set_vertical_tunnel(session, height + 32); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/transport/miniature_railway.c b/src/openrct2/ride/transport/miniature_railway.c index 55d18a8c9f..72bf715282 100644 --- a/src/openrct2/ride/transport/miniature_railway.c +++ b/src/openrct2/ride/transport/miniature_railway.c @@ -590,7 +590,7 @@ static void paint_miniature_railway_track_flat(paint_session * session, uint8 ri sub_98197C_rotated(direction, imageId, 0, 6, 32, 20, 2, height, 0, 6, height); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -609,7 +609,7 @@ static void paint_miniature_railway_station(paint_session * session, uint8 rideI imageId = miniature_railway_track_pieces_flat_station[direction] | gTrackColours[SCHEME_TRACK]; sub_98199C_rotated(direction, imageId, 0, 6, 32, 20, 2, height, 0, 0, height); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); track_paint_util_draw_station_3(session, rideIndex, trackSequence, direction, height + 2, height, mapElement); // covers shouldn't be offset by +2 @@ -627,10 +627,10 @@ static void paint_miniature_railway_track_25_deg_up(paint_session * session, uin sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height); switch (direction) { - case 0: paint_util_push_tunnel_left(height - 8, TUNNEL_7); break; - case 1: paint_util_push_tunnel_right(height + 8, TUNNEL_8); break; - case 2: paint_util_push_tunnel_left(height + 8, TUNNEL_8); break; - case 3: paint_util_push_tunnel_right(height - 8, TUNNEL_7); break; + case 0: paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; + case 1: paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; + case 2: paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; + case 3: paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } wooden_a_supports_paint_setup(session, direction & 1, 45 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -648,10 +648,10 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(paint_session * sess sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height); switch (direction) { - case 0: paint_util_push_tunnel_left(height, TUNNEL_6); break; - case 1: paint_util_push_tunnel_right(height, TUNNEL_8); break; - case 2: paint_util_push_tunnel_left(height, TUNNEL_8); break; - case 3: paint_util_push_tunnel_right(height, TUNNEL_6); break; + case 0: paint_util_push_tunnel_left(session, height, TUNNEL_6); break; + case 1: paint_util_push_tunnel_right(session, height, TUNNEL_8); break; + case 2: paint_util_push_tunnel_left(session, height, TUNNEL_8); break; + case 3: paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } wooden_a_supports_paint_setup(session, direction & 1, 37 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -669,10 +669,10 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(paint_session * sess sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height); switch (direction) { - case 0: paint_util_push_tunnel_left(height - 8, TUNNEL_6); break; - case 1: paint_util_push_tunnel_right(height + 8, TUNNEL_14); break; - case 2: paint_util_push_tunnel_left(height + 8, TUNNEL_14); break; - case 3: paint_util_push_tunnel_right(height - 8, TUNNEL_6); break; + case 0: paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; + case 1: paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; + case 2: paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; + case 3: paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } wooden_a_supports_paint_setup(session, direction & 1, 41 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -855,19 +855,19 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(paint_sessi } } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } sint32 blockedSegments = 0; @@ -954,11 +954,11 @@ static void paint_miniature_railway_track_s_bend_left(paint_session * session, u } if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } } @@ -1035,11 +1035,11 @@ static void paint_miniature_railway_track_s_bend_right(paint_session * session, if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } } @@ -1288,10 +1288,10 @@ static void paint_miniature_railway_track_left_eighth_to_diag(paint_session * se } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1439,10 +1439,10 @@ static void paint_miniature_railway_track_right_eighth_to_diag(paint_session * s } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); diff --git a/src/openrct2/ride/transport/monorail.c b/src/openrct2/ride/transport/monorail.c index a799a7db9e..b3716abcfe 100644 --- a/src/openrct2/ride/transport/monorail.c +++ b/src/openrct2/ride/transport/monorail.c @@ -454,9 +454,9 @@ static void paint_monorail_track_flat(paint_session * session, uint8 rideIndex, } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } if (track_paint_util_should_paint_supports(position)) { @@ -488,9 +488,9 @@ static void paint_monorail_station(paint_session * session, uint8 rideIndex, uin } if (direction == 0 || direction == 2) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } if (direction == 0 || direction == 2) { @@ -521,10 +521,10 @@ static void paint_monorail_track_25_deg_up(paint_session * session, uint8 rideIn } switch (direction) { - case 0: paint_util_push_tunnel_left(height - 8, TUNNEL_7); break; - case 1: paint_util_push_tunnel_right(height + 8, TUNNEL_8); break; - case 2: paint_util_push_tunnel_left(height + 8, TUNNEL_8); break; - case 3: paint_util_push_tunnel_right(height - 8, TUNNEL_7); break; + case 0: paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; + case 1: paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; + case 2: paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; + case 3: paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } if (track_paint_util_should_paint_supports(position)) { @@ -549,10 +549,10 @@ static void paint_monorail_track_flat_to_25_deg_up(paint_session * session, uint } switch (direction) { - case 0: paint_util_push_tunnel_left(height, TUNNEL_6); break; - case 1: paint_util_push_tunnel_right(height, TUNNEL_8); break; - case 2: paint_util_push_tunnel_left(height, TUNNEL_8); break; - case 3: paint_util_push_tunnel_right(height, TUNNEL_6); break; + case 0: paint_util_push_tunnel_left(session, height, TUNNEL_6); break; + case 1: paint_util_push_tunnel_right(session, height, TUNNEL_8); break; + case 2: paint_util_push_tunnel_left(session, height, TUNNEL_8); break; + case 3: paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } if (track_paint_util_should_paint_supports(position)) { @@ -577,10 +577,10 @@ static void paint_monorail_track_25_deg_up_to_flat(paint_session * session, uint } switch (direction) { - case 0: paint_util_push_tunnel_left(height - 8, TUNNEL_6); break; - case 1: paint_util_push_tunnel_right(height + 8, TUNNEL_14); break; - case 2: paint_util_push_tunnel_left(height + 8, TUNNEL_14); break; - case 3: paint_util_push_tunnel_right(height - 8, TUNNEL_6); break; + case 0: paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; + case 1: paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; + case 2: paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; + case 3: paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } if (track_paint_util_should_paint_supports(position)) { @@ -622,19 +622,19 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(paint_session * sess } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } sint32 blockedSegments = 0; @@ -691,7 +691,7 @@ static void paint_monorail_track_s_bend_left(paint_session * session, uint8 ride if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } switch (trackSequence) { @@ -701,7 +701,7 @@ static void paint_monorail_track_s_bend_left(paint_session * session, uint8 ride } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } switch (trackSequence) { @@ -755,7 +755,7 @@ static void paint_monorail_track_s_bend_right(paint_session * session, uint8 rid if (direction == 0 || direction == 2) { if (trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } switch (trackSequence) { @@ -765,7 +765,7 @@ static void paint_monorail_track_s_bend_right(paint_session * session, uint8 rid } } else { if (trackSequence == 3) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } switch (trackSequence) { @@ -843,10 +843,10 @@ static void paint_monorail_track_left_eighth_to_diag(paint_session * session, ui } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } sint32 blockedSegments = 0; @@ -886,10 +886,10 @@ static void paint_monorail_track_right_eighth_to_diag(paint_session * session, u } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } sint32 blockedSegments = 0; diff --git a/src/openrct2/ride/transport/suspended_monorail.c b/src/openrct2/ride/transport/suspended_monorail.c index 71ebc9594b..c14fbbb49e 100644 --- a/src/openrct2/ride/transport/suspended_monorail.c +++ b/src/openrct2/ride/transport/suspended_monorail.c @@ -45,7 +45,7 @@ static void suspended_monorail_track_flat(paint_session * session, uint8 rideInd metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_general_support_height(height + 48, 0x20); } @@ -64,7 +64,7 @@ static void suspended_monorail_track_station(paint_session * session, uint8 ride sub_98199C_rotated(direction, imageIds[direction][2] | gTrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 32, 0, 6, height + 32); track_paint_util_draw_station_metal_supports_2(session, direction, height, gTrackColours[SCHEME_SUPPORTS], 3); track_paint_util_draw_station_inverted(session, rideIndex, trackSequence, direction, height, mapElement, STATION_VARIANT_TALL); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -106,9 +106,9 @@ static void suspended_monorail_track_25_deg_up(paint_session * session, uint8 ri } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_general_support_height(height + 72, 0x20); } @@ -150,9 +150,9 @@ static void suspended_monorail_track_flat_to_25_deg_up(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_general_support_height(height + 64, 0x20); } @@ -194,9 +194,9 @@ static void suspended_monorail_track_25_deg_up_to_flat(paint_session * session, } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_9); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_15); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_15); } paint_util_set_general_support_height(height + 56, 0x20); } @@ -243,7 +243,7 @@ static void suspended_monorail_track_left_quarter_turn_5(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -328,10 +328,10 @@ static void suspended_monorail_track_left_quarter_turn_5(paint_session * session switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -370,7 +370,7 @@ static void suspended_monorail_track_s_bend_left(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -451,10 +451,10 @@ static void suspended_monorail_track_s_bend_left(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -486,7 +486,7 @@ static void suspended_monorail_track_s_bend_right(paint_session * session, uint8 metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -567,10 +567,10 @@ static void suspended_monorail_track_s_bend_right(paint_session * session, uint8 switch (direction) { case 1: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 2: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -602,7 +602,7 @@ static void suspended_monorail_track_left_quarter_turn_3(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -648,10 +648,10 @@ static void suspended_monorail_track_left_quarter_turn_3(paint_session * session switch (direction) { case 2: - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); break; case 3: - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); break; } paint_util_set_general_support_height(height + 48, 0x20); @@ -690,7 +690,7 @@ static void suspended_monorail_track_left_eighth_to_diag(paint_session * session metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; @@ -795,7 +795,7 @@ static void suspended_monorail_track_right_eighth_to_diag(paint_session * sessio metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9); } paint_util_set_general_support_height(height + 48, 0x20); break; diff --git a/src/openrct2/ride/water/boat_ride.c b/src/openrct2/ride/water/boat_ride.c index a852786e86..ac4455e3de 100644 --- a/src/openrct2/ride/water/boat_ride.c +++ b/src/openrct2/ride/water/boat_ride.c @@ -67,10 +67,10 @@ static void paint_boat_ride_station(paint_session * session, uint8 rideIndex, ui const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); track_paint_util_draw_pier(session, ride, entranceStyle, position, direction, height, mapElement, get_current_rotation()); } else { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); track_paint_util_draw_pier(session, ride, entranceStyle, position, direction, height, mapElement, get_current_rotation()); } diff --git a/src/openrct2/ride/water/dingy_slide.c b/src/openrct2/ride/water/dingy_slide.c index 439fcdb232..82c08f9e08 100644 --- a/src/openrct2/ride/water/dingy_slide.c +++ b/src/openrct2/ride/water/dingy_slide.c @@ -383,7 +383,7 @@ static void dinghy_slide_track_flat(paint_session * session, uint8 rideIndex, ui metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -406,7 +406,7 @@ static void dinghy_slide_track_station(paint_session * session, uint8 rideIndex, track_paint_util_draw_station(session, rideIndex, trackSequence, direction, height, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -441,9 +441,9 @@ static void dinghy_slide_track_25_deg_up(paint_session * session, uint8 rideInde } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -470,9 +470,9 @@ static void dinghy_slide_track_60_deg_up(paint_session * session, uint8 rideInde } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -508,9 +508,9 @@ static void dinghy_slide_track_flat_to_25_deg_up(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -537,9 +537,9 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -566,9 +566,9 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -604,9 +604,9 @@ static void dinghy_slide_track_25_deg_up_to_flat(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -712,16 +712,16 @@ static void dinghy_slide_track_right_quarter_turn_5(paint_session * session, uin } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -807,11 +807,11 @@ static void dinghy_slide_track_s_bend_left(paint_session * session, uint8 rideIn if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } @@ -879,11 +879,11 @@ static void dinghy_slide_track_s_bend_right(paint_session * session, uint8 rideI if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } @@ -984,7 +984,7 @@ static void dinghy_slide_track_flat_covered(paint_session * session, uint8 rideI metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -1010,9 +1010,9 @@ static void dinghy_slide_track_25_deg_up_covered(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -1039,9 +1039,9 @@ static void dinghy_slide_track_60_deg_up_covered(paint_session * session, uint8 } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -1068,9 +1068,9 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(paint_session * session } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -1097,9 +1097,9 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(paint_session * se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -1126,9 +1126,9 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(paint_session * se } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -1155,9 +1155,9 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(paint_session * session } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); @@ -1263,16 +1263,16 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(paint_session * sess } if (direction == 0 && trackSequence == 0) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 0 && trackSequence == 6) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } if (direction == 1 && trackSequence == 6) { - paint_util_push_tunnel_left(height, TUNNEL_0); + paint_util_push_tunnel_left(session, height, TUNNEL_0); } if (direction == 3 && trackSequence == 0) { - paint_util_push_tunnel_right(height, TUNNEL_0); + paint_util_push_tunnel_right(session, height, TUNNEL_0); } switch (trackSequence) { @@ -1353,11 +1353,11 @@ static void dinghy_slide_track_s_bend_left_covered(paint_session * session, uint if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } @@ -1425,11 +1425,11 @@ static void dinghy_slide_track_s_bend_right_covered(paint_session * session, uin if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } diff --git a/src/openrct2/ride/water/log_flume.c b/src/openrct2/ride/water/log_flume.c index bea37b1387..24b0e6b5d8 100644 --- a/src/openrct2/ride/water/log_flume.c +++ b/src/openrct2/ride/water/log_flume.c @@ -180,7 +180,7 @@ static void paint_log_flume_track_flat(paint_session * session, uint8 rideIndex, metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -208,7 +208,7 @@ static void paint_log_flume_track_station(paint_session * session, uint8 rideInd track_paint_util_draw_station_3(session, rideIndex, trackSequence, direction, height + 2, height, mapElement); // Covers shouldn't be offset by +2 - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -235,9 +235,9 @@ static void paint_log_flume_track_25_deg_up(paint_session * session, uint8 rideI } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -264,9 +264,9 @@ static void paint_log_flume_track_flat_to_25_deg_up(paint_session * session, uin } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -293,9 +293,9 @@ static void paint_log_flume_track_25_deg_up_to_flat(paint_session * session, uin } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -322,9 +322,9 @@ static void paint_log_flume_track_25_deg_down(paint_session * session, uint8 rid } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_2); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -351,9 +351,9 @@ static void paint_log_flume_track_flat_to_25_deg_down(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_12); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -380,9 +380,9 @@ static void paint_log_flume_track_25_deg_down_to_flat(paint_session * session, u } if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_2); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_2); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -449,11 +449,11 @@ static void paint_log_flume_track_s_bend_left(paint_session * session, uint8 rid if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } @@ -521,11 +521,11 @@ static void paint_log_flume_track_s_bend_right(paint_session * session, uint8 ri if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } } @@ -560,12 +560,12 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(paint_session * sess switch (trackSequence) { case 0: if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } break; case 3: if (direction == 2 || direction == 3) { - paint_util_push_tunnel_rotated(direction ^ 1, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_0); } break; } @@ -607,12 +607,12 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(paint_session * ses switch (trackSequence) { case 0: if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); } break; case 3: if (direction == 0 || direction == 1) { - paint_util_push_tunnel_rotated(direction ^ 1, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_0); } break; } @@ -647,7 +647,7 @@ static void paint_log_flume_track_on_ride_photo(paint_session * session, uint8 r track_paint_util_onride_photo_paint(session, direction, height + 3, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -670,7 +670,7 @@ static void paint_log_flume_track_reverser(paint_session * session, uint8 rideIn metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/openrct2/ride/water/river_rapids.c b/src/openrct2/ride/water/river_rapids.c index 8903f31f0b..514a8ed55d 100644 --- a/src/openrct2/ride/water/river_rapids.c +++ b/src/openrct2/ride/water/river_rapids.c @@ -274,9 +274,9 @@ static void paint_river_rapids_track_flat(paint_session * session, uint8 rideInd wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -307,7 +307,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc sub_98197C(imageId, 0, 0, 32, 1, 34, height, 0, 27, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 0, 9, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height - 8, TUNNEL_7); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_7); break; case 1: @@ -319,7 +319,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc sub_98197C(imageId, 0, 0, 1, 32, 34, height, 27, 0, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 1, 10, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height + 8, TUNNEL_8); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_8); break; case 2: @@ -331,7 +331,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc sub_98197C(imageId, 0, 0, 32, 1, 34, height, 0, 27, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 0, 11, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height + 8, TUNNEL_8); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_8); break; case 3: @@ -342,7 +342,7 @@ static void paint_river_rapids_track_25_deg(paint_session * session, uint8 direc sub_98197C(imageId, 0, 0, 1, 32, 34, height, 27, 0, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 1, 12, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height - 8, TUNNEL_7); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_7); break; } @@ -364,7 +364,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u sub_98197C(imageId, 0, 0, 32, 1, 18, height, 0, 27, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 0, 5, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height - 8, TUNNEL_6); + paint_util_push_tunnel_left(session, height - 8, TUNNEL_6); break; case 1: @@ -376,7 +376,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u sub_98197C(imageId, 0, 0, 1, 32, 18, height, 27, 0, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 1, 6, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height + 8, TUNNEL_14); + paint_util_push_tunnel_right(session, height + 8, TUNNEL_14); break; case 2: @@ -388,7 +388,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u sub_98197C(imageId, 0, 0, 32, 1, 18, height, 0, 27, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 0, 7, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height + 8, TUNNEL_14); + paint_util_push_tunnel_left(session, height + 8, TUNNEL_14); break; case 3: @@ -399,7 +399,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(paint_session * session, u sub_98197C(imageId, 0, 0, 1, 32, 18, height, 27, 0, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 1, 8, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height - 8, TUNNEL_6); + paint_util_push_tunnel_right(session, height - 8, TUNNEL_6); break; } @@ -421,7 +421,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u sub_98197C(imageId, 0, 0, 32, 1, 26, height, 0, 27, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 0, 1, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: @@ -433,7 +433,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u sub_98197C(imageId, 0, 0, 1, 32, 26, height, 27, 0, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 1, 2, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_8); + paint_util_push_tunnel_right(session, height, TUNNEL_8); break; case 2: @@ -445,7 +445,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u sub_98197C(imageId, 0, 0, 32, 1, 26, height, 0, 27, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 0, 3, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_left(height, TUNNEL_8); + paint_util_push_tunnel_left(session, height, TUNNEL_8); break; case 3: @@ -456,7 +456,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u sub_98197C(imageId, 0, 0, 1, 32, 26, height, 27, 0, height + 16, get_current_rotation()); wooden_a_supports_paint_setup(session, 1, 4, height, gTrackColours[SCHEME_SUPPORTS], NULL); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -512,7 +512,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(paint_session * se imageId = SPR_RIVER_RAPIDS_LEFT_QUARTER_TURN_1_TILE_FRONT_SW_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 2, 1, 7, height, 28, 27, height + 13, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 1: @@ -533,7 +533,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(paint_session * se imageId = SPR_RIVER_RAPIDS_LEFT_QUARTER_TURN_1_TILE_FRONT_NE_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 2, 7, height, 27, 28, height + 13, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 3: @@ -543,8 +543,8 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(paint_session * se imageId = SPR_RIVER_RAPIDS_LEFT_QUARTER_TURN_1_TILE_FRONT_SE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 1, 7, height, 28, 28, height + 13, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -566,8 +566,8 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(paint_session * s imageId = SPR_RIVER_RAPIDS_RIGHT_QUARTER_TURN_1_TILE_FRONT_SW_SE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 1, 7, height, 28, 28, height + 13, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; case 1: @@ -577,7 +577,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(paint_session * s imageId = SPR_RIVER_RAPIDS_RIGHT_QUARTER_TURN_1_TILE_FRONT_SE_NE | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 2, 1, 7, height, 28, 27, height + 13, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); break; case 2: @@ -598,7 +598,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(paint_session * s imageId = SPR_RIVER_RAPIDS_RIGHT_QUARTER_TURN_1_TILE_FRONT_NW_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 28, 7, height, 27, 2, height + 13, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); break; } @@ -649,9 +649,9 @@ static void paint_river_rapids_track_waterfall(paint_session * session, uint8 ri wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_9); + paint_util_push_tunnel_right(session, height, TUNNEL_9); } else { - paint_util_push_tunnel_left(height, TUNNEL_9); + paint_util_push_tunnel_left(session, height, TUNNEL_9); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -682,9 +682,9 @@ static void paint_river_rapids_track_rapids(paint_session * session, uint8 rideI wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -729,9 +729,9 @@ static void paint_river_rapids_track_whirlpool(paint_session * session, uint8 ri wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); diff --git a/src/openrct2/ride/water/splash_boats.c b/src/openrct2/ride/water/splash_boats.c index 36d942579f..6ed96c154b 100644 --- a/src/openrct2/ride/water/splash_boats.c +++ b/src/openrct2/ride/water/splash_boats.c @@ -509,9 +509,9 @@ static void paint_splash_boats_track_25_deg_up(paint_session * session, uint8 ri wooden_a_supports_paint_setup(session, (direction & 1), 9 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -528,9 +528,9 @@ static void paint_splash_boats_track_60_deg_up(paint_session * session, uint8 ri wooden_a_supports_paint_setup(session, (direction & 1), 21 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 56, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 56, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); @@ -547,9 +547,9 @@ static void paint_splash_boats_track_flat_to_25_deg_up(paint_session * session, wooden_a_supports_paint_setup(session, (direction & 1), 1 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -566,9 +566,9 @@ static void paint_splash_boats_track_25_deg_up_to_flat(paint_session * session, wooden_a_supports_paint_setup(session, (direction & 1), 5 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } else { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -585,9 +585,9 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(paint_session * sess wooden_a_supports_paint_setup(session, (direction & 1), 13 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -604,9 +604,9 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(paint_session * sess wooden_a_supports_paint_setup(session, (direction & 1), 17 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); @@ -624,9 +624,9 @@ static void paint_splash_boats_track_25_deg_down(paint_session * session, uint8 wooden_a_supports_paint_setup(session, (direction & 1), specialSupport[direction], height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_8); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); @@ -649,9 +649,9 @@ static void paint_splash_boats_track_flat_to_25_deg_down(paint_session * session wooden_a_supports_paint_setup(session, (direction & 1), specialSupport[direction], height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_14); + paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_14); } else { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 40, 0x20); @@ -679,9 +679,9 @@ static void paint_splash_boats_track_25_deg_down_to_flat(paint_session * session wooden_a_supports_paint_setup(session, (direction & 1), specialSupport[direction], height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); + paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7); } else { - paint_util_push_tunnel_rotated(direction, height + 24, TUNNEL_8); + paint_util_push_tunnel_rotated(session, direction, height + 24, TUNNEL_8); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); @@ -710,9 +710,9 @@ static void paint_splash_boats_track_flat(paint_session * session, uint8 rideInd wooden_a_supports_paint_setup(session, (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); if (direction & 1) { - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); } else { - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -742,7 +742,7 @@ static void paint_splash_boats_station(paint_session * session, uint8 rideIndex, track_paint_util_draw_station_platform(session, ride, direction, height, 7, mapElement); - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); @@ -778,12 +778,12 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(paint_session * s switch (trackSequence) { case 0: if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } break; case 6: if (direction == 2 || direction == 3) { - paint_util_push_tunnel_rotated(direction ^ 1, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_6); } break; } @@ -821,12 +821,12 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(paint_session * switch (trackSequence) { case 0: if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } break; case 6: if (direction == 0 || direction == 1) { - paint_util_push_tunnel_rotated(direction ^ 1, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction ^ 1, height, TUNNEL_6); } break; } @@ -898,11 +898,11 @@ static void paint_splash_boats_track_s_bend_left(paint_session * session, uint8 if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } } @@ -973,11 +973,11 @@ static void paint_splash_boats_track_s_bend_right(paint_session * session, uint8 if (trackSequence == 0) { if (direction == 0 || direction == 3) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } } else if (trackSequence == 3) { if (direction == 1 || direction == 2) { - paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6); } } diff --git a/src/openrct2/ride/water/submarine_ride.c b/src/openrct2/ride/water/submarine_ride.c index d190b01c59..7e5b749b18 100644 --- a/src/openrct2/ride/water/submarine_ride.c +++ b/src/openrct2/ride/water/submarine_ride.c @@ -80,13 +80,13 @@ static void submarine_ride_paint_track_station(paint_session * session, uint8 ri imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); - paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_right(session, height, TUNNEL_6); track_paint_util_draw_pier(session, ride, entranceStyle, position, direction, height, mapElement, get_current_rotation()); } else { imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); - paint_util_push_tunnel_left(height, TUNNEL_6); + paint_util_push_tunnel_left(session, height, TUNNEL_6); track_paint_util_draw_pier(session, ride, entranceStyle, position, direction, height, mapElement, get_current_rotation()); } @@ -103,11 +103,11 @@ static void submarine_ride_paint_track_flat(paint_session * session, uint8 rideI if (direction & 1) { imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); - paint_util_push_tunnel_right(heightLower, TUNNEL_0); + paint_util_push_tunnel_right(session, heightLower, TUNNEL_0); } else { imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); - paint_util_push_tunnel_left(heightLower, TUNNEL_0); + paint_util_push_tunnel_left(session, heightLower, TUNNEL_0); } if (track_paint_util_should_paint_supports(position)) { diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 6794a50c7c..6126c7f299 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -876,7 +876,7 @@ private: int tunnelHeight = verticalTunnelHeights[0]; if (tunnelHeight != 0) { - WriteLine(tabs, "paint_util_set_vertical_tunnel(height%s);", GetOffsetExpressionString(tunnelHeight).c_str()); + WriteLine(tabs, "paint_util_set_vertical_tunnel(session, height%s);", GetOffsetExpressionString(tunnelHeight).c_str()); } } } @@ -885,17 +885,17 @@ private: { switch (way) { case 0: - WriteLine(tabs, "paint_util_push_tunnel_left(height%s, TUNNEL_%d);", GetOffsetExpressionString(offset).c_str(), type); + WriteLine(tabs, "paint_util_push_tunnel_left(session, height%s, TUNNEL_%d);", GetOffsetExpressionString(offset).c_str(), type); break; case 1: - WriteLine(tabs, "paint_util_push_tunnel_right(height%s, TUNNEL_%d);", GetOffsetExpressionString(offset).c_str(), type); + WriteLine(tabs, "paint_util_push_tunnel_right(session, height%s, TUNNEL_%d);", GetOffsetExpressionString(offset).c_str(), type); break; } } void GenerateTunnelCall(int tabs, int offset, int type) { - WriteLine(tabs, "paint_util_push_tunnel_rotated(direction, height%s, TUNNEL_%d);", GetOffsetExpressionString(offset).c_str(), type); + WriteLine(tabs, "paint_util_push_tunnel_rotated(session, direction, height%s, TUNNEL_%d);", GetOffsetExpressionString(offset).c_str(), type); } void GenerateSegmentSupportCall(int tabs, std::vector segmentSupportCalls[4])