diff --git a/src/paint/map_element/map_element.h b/src/paint/map_element/map_element.h index d053b2001f..c3259833b3 100644 --- a/src/paint/map_element/map_element.h +++ b/src/paint/map_element/map_element.h @@ -51,6 +51,8 @@ extern const uint16 segment_offsets[9]; enum { TUNNEL_0 = 0, + TUNNEL_1 = 1, + TUNNEL_2 = 2, TUNNEL_6 = 6, TUNNEL_7 = 7, TUNNEL_8 = 8, diff --git a/src/ride/gentle/mini_helicopters.c b/src/ride/gentle/mini_helicopters.c index 6f73637daa..e47f72cdec 100644 --- a/src/ride/gentle/mini_helicopters.c +++ b/src/ride/gentle/mini_helicopters.c @@ -58,10 +58,41 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint } -/** rct2: 0x */ +/** rct2: 0x0081F358 */ static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)}; + uint32 imageId; + switch (direction) { + case 0: + imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_SW_NE | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); + paint_util_push_tunnel_left(height - 8, TUNNEL_1); + break; + case 1: + imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_NW_SE | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); + paint_util_push_tunnel_right(height + 8, TUNNEL_2); + break; + case 2: + imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_NE_SW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); + paint_util_push_tunnel_left(height + 8, TUNNEL_2); + break; + case 3: + imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_25_DEG_UP_SE_NW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, get_current_rotation()); + paint_util_push_tunnel_right(height - 8, TUNNEL_1); + break; + } + + if (track_paint_util_should_paint_supports(position)) { + metal_a_supports_paint_setup(4, 4, -9, height, RCT2_GLOBAL(0x00F4419C, uint32)); + } + + 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 + 56, 0x20); } /** rct2: 0x */ @@ -76,10 +107,10 @@ static void paint_mini_helicopters_track_flat_to_25_deg_down(uint8 rideIndex, ui } -/** rct2: 0x */ +/** rct2: 0x0081F388 */ static void paint_mini_helicopters_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - + paint_mini_helicopters_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x */