diff --git a/src/ride/coaster/heartline_twister_coaster.c b/src/ride/coaster/heartline_twister_coaster.c index 47ee266a3f..3861bcf0b2 100644 --- a/src/ride/coaster/heartline_twister_coaster.c +++ b/src/ride/coaster/heartline_twister_coaster.c @@ -72,6 +72,24 @@ static void heartline_twister_rc_track_flat(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } +static void heartline_twister_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + static const uint32 imageIds[4][3] = { + { 19732, SPR_STATION_BASE_B_SW_NE }, + { 19733, SPR_STATION_BASE_B_NW_SE }, + { 19732, SPR_STATION_BASE_B_SW_NE }, + { 19733, SPR_STATION_BASE_B_NW_SE }, + }; + + sub_98197C_rotated(direction, imageIds[direction][0] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); + sub_98196C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); + track_paint_util_draw_station_metal_supports_2(direction, height, gTrackColours[SCHEME_SUPPORTS], 0); + track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement); + paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 32, 0x20); +} + static void heartline_twister_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -491,28 +509,28 @@ static void heartline_twister_rc_track_heartline_transfer_up(uint8 rideIndex, ui sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21318, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(6, 5, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(6, 5, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height + 8, 0, 6, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21319, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(7, 6, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(7, 6, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height + 8, 0, 6, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21320, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(6, 7, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(6, 7, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 3: sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height + 8, 0, 6, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21321, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(7, 8, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(7, 8, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -611,28 +629,28 @@ static void heartline_twister_rc_track_heartline_transfer_down(uint8 rideIndex, sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21318, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(6, 5, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(6, 5, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height + 8, 0, 6, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21319, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(7, 6, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(7, 6, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height + 8, 0, 6, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21320, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(6, 7, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(6, 7, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 3: sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height + 8, 0, 6, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height + 16, 0, 6, height + 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21321, 0, 0, 32, 1, 34, height + 8, 0, 27, height + 8); sub_98199C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27, height + 16); - wooden_a_supports_paint_setup(7, 8, height + 8, 0x00000000, NULL); + wooden_a_supports_paint_setup(7, 8, height + 8, gTrackColours[SCHEME_SUPPORTS], NULL); break; } paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); @@ -1031,6 +1049,10 @@ TRACK_PAINT_FUNCTION get_track_paint_function_heartline_twister_rc(int trackType switch (trackType) { case TRACK_ELEM_FLAT: return heartline_twister_rc_track_flat; + case TRACK_ELEM_END_STATION: + case TRACK_ELEM_BEGIN_STATION: + case TRACK_ELEM_MIDDLE_STATION: + return heartline_twister_rc_track_station; case TRACK_ELEM_25_DEG_UP: return heartline_twister_rc_track_25_deg_up; case TRACK_ELEM_60_DEG_UP: