diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index 5693006199..4602200820 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -403,9 +403,34 @@ static void paint_viriginia_reel_track_25_deg_down_to_flat(uint8 rideIndex, uint paint_viriginia_reel_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } -/** rct2: 0x */ +/** rct2: 0x008112D4, 0x008112E4, 0x008112F4 */ static void paint_viriginia_reel_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + uint32 imageId; + + if (direction == 0 || direction == 2) { + imageId = SPR_STATION_BASE_B_SW_NE | RCT2_GLOBAL(0x00F441A0, uint32); + sub_98197C(imageId, 0, 0, 32, 28, 2, height - 2, 0, 2, height, get_current_rotation()); + + imageId = SPR_VIRGINIA_REEL_FLAT_SW_NE | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); + + paint_util_push_tunnel_left(height, TUNNEL_6); + } else if (direction == 1 || direction == 3) { + imageId = SPR_STATION_BASE_B_NW_SE | RCT2_GLOBAL(0x00F441A0, uint32); + sub_98197C(imageId, 0, 0, 28, 32, 2, height - 2, 2, 0, height, get_current_rotation()); + + imageId = SPR_VIRGINIA_REEL_FLAT_NW_SE | RCT2_GLOBAL(0x00F44198, uint32); + sub_98199C(imageId, 0, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation()); + + paint_util_push_tunnel_right(height, TUNNEL_6); + } + + wooden_a_supports_paint_setup((direction & 1), 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement); + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 32, 0x20); } static const uint8 virginia_reel_left_quarter_turn_supports[] = {5, 2, 3, 4}; diff --git a/src/ride/gentle/mini_helicopters.c b/src/ride/gentle/mini_helicopters.c index 3f4b447050..1468d7b162 100644 --- a/src/ride/gentle/mini_helicopters.c +++ b/src/ride/gentle/mini_helicopters.c @@ -26,163 +26,33 @@ /** rct2: 0x */ static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)}; - rct_ride * ride = get_ride(rideIndex); - const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; uint32 imageId; - bool hasFence; - - bool hasGreenLight = (bool) (mapElement->properties.track.sequence & 0x80); if (direction == 0 || direction == 2) { - // height -= 2 (height - 2) imageId = SPR_STATION_BASE_B_SW_NE | RCT2_GLOBAL(0x00F441A0, uint32); sub_98197C(imageId, 0, 0, 32, 28, 1, height - 2, 0, 2, height, get_current_rotation()); - // height += 2 (height) imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW | RCT2_GLOBAL(0x00F44198, uint32); sub_98199C(imageId, 0, 0, 32, 20, 1, height, 0, 0, height, get_current_rotation()); metal_a_supports_paint_setup(3, 5, 0, height, RCT2_GLOBAL(0x00F4419C, uint32)); metal_a_supports_paint_setup(3, 8, 0, height, RCT2_GLOBAL(0x00F4419C, uint32)); - paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_push_tunnel_left(height, TUNNEL_6); - - //height += 5 (height + 5); - hasFence = track_paint_util_has_fence(EDGE_NW, position, mapElement, ride, get_current_rotation()); - - if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 0) { - if (hasGreenLight) { - imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_GREEN_LIGHT_SW_NE : SPR_STATION_PLATFORM_END_GREEN_LIGHT_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_RED_LIGHT_SW_NE : SPR_STATION_PLATFORM_END_RED_LIGHT_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); - } - } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 2) { - imageId = (hasFence ? SPR_STATION_PLATFORM_BEGIN_FENCED_SW_NE : SPR_STATION_PLATFORM_BEGIN_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_SW_NE : SPR_STATION_PLATFORM_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); - } - sub_98196C(imageId, 0, 0, 32, 8, 1, height + 5, get_current_rotation()); - //height -= 5 (height) - track_paint_util_draw_station_covers(EDGE_NW, hasFence, entranceStyle, direction, height); - //height += 5 (height + 5) - - if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 0) { - imageId = (hasGreenLight ? SPR_STATION_PLATFORM_END_GREEN_LIGHT_SW_NE : SPR_STATION_PLATFORM_END_RED_LIGHT_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); - } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 2) { - imageId = SPR_STATION_PLATFORM_BEGIN_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = SPR_STATION_PLATFORM_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); - } - sub_98196C(imageId, 0, 24, 32, 8, 1, height + 5, get_current_rotation()); - //height += 2 (height + 7) - - hasFence = track_paint_util_has_fence(EDGE_SE, position, mapElement, ride, get_current_rotation()); - if (hasFence) { - if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 0) { - imageId = SPR_STATION_BEGIN_ANGLE_FENCE_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); - } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 2) { - imageId = SPR_STATION_LIGHT_BACK_ANGLE_FENCED_NE_SW | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = SPR_STATION_FENCE_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); - } - sub_98196C(imageId, 0, 31, 32, 1, 7, height + 7, get_current_rotation()); - } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 0) { - // Addition: draw only small fence if there is an entrance/exit at the beginning - imageId = SPR_STATION_FENCE_SMALL_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 31, 23, 1, 8, 7, height + 7, get_current_rotation()); - } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 2) { - // Addition: draw only small fence if there is an entrance/exit at the end - imageId = SPR_STATION_LIGHT_BACK_NE_SW | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 31, 23, 1, 8, 7, height + 7, get_current_rotation()); - } - //height -= 7 (height) - track_paint_util_draw_station_covers(EDGE_SE, hasFence, entranceStyle, direction, height); - //height += 7 (height + 7) - - if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 0) { - imageId = SPR_STATION_FENCE_SMALL_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 31, 0, 1, 8, 7, height + 7, get_current_rotation()); - } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 2) { - imageId = SPR_STATION_LIGHT_BACK_NE_SW | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 31, 0, 1, 8, 7, height + 7, get_current_rotation()); - } } else if (direction == 1 || direction == 3) { - // height -= 2 (height - 2) imageId = SPR_STATION_BASE_B_NW_SE | RCT2_GLOBAL(0x00F441A0, uint32); sub_98197C(imageId, 0, 0, 28, 32, 1, height - 2, 2, 0, height, get_current_rotation()); - // height += 2 (height) imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW | RCT2_GLOBAL(0x00F44198, uint32); sub_98199C(imageId, 0, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation()); metal_a_supports_paint_setup(3, 6, 0, height, RCT2_GLOBAL(0x00F4419C, uint32)); metal_a_supports_paint_setup(3, 7, 0, height, RCT2_GLOBAL(0x00F4419C, uint32)); - paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_push_tunnel_right(height, TUNNEL_6); - - //height += 5 (height + 5); - hasFence = track_paint_util_has_fence(EDGE_NE, position, mapElement, ride, get_current_rotation()); - - if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 3) { - if (hasGreenLight) { - imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_GREEN_LIGHT_NW_SE : SPR_STATION_PLATFORM_END_GREEN_LIGHT_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_RED_LIGHT_NW_SE : SPR_STATION_PLATFORM_END_RED_LIGHT_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); - } - } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 1) { - imageId = (hasFence ? SPR_STATION_PLATFORM_BEGIN_FENCED_NW_SE : SPR_STATION_PLATFORM_BEGIN_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_NW_SE : SPR_STATION_PLATFORM_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); - } - sub_98196C(imageId, 0, 0, 8, 32, 1, height + 5, get_current_rotation()); - //height -= 5 (height) - track_paint_util_draw_station_covers(EDGE_NE, hasFence, entranceStyle, direction, height); - //height += 5 (height + 5) - - if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 3) { - imageId = (hasGreenLight ? SPR_STATION_PLATFORM_END_GREEN_LIGHT_NW_SE : SPR_STATION_PLATFORM_END_RED_LIGHT_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); - } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 1) { - imageId = SPR_STATION_PLATFORM_BEGIN_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = SPR_STATION_PLATFORM_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - } - sub_98196C(imageId, 24, 0, 8, 32, 1, height + 5, get_current_rotation()); - //height += 2 (height + 7) - - hasFence = track_paint_util_has_fence(EDGE_SW, position, mapElement, ride, get_current_rotation()); - if (hasFence) { - if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 3) { - imageId = SPR_STATION_BEGIN_ANGLE_FENCE_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 1) { - imageId = SPR_STATION_LIGHT_BACK_ANGLE_FENCED_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - } else { - imageId = SPR_STATION_FENCE_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - } - sub_98196C(imageId, 31, 0, 1, 32, 7, height + 7, get_current_rotation()); - } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 3) { - // Addition: draw only small fence if there is an entrance/exit at the beginning - imageId = SPR_STATION_FENCE_SMALL_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 23, 31, 8, 1, 7, height + 7, get_current_rotation()); - } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 1) { - // Addition: draw only small fence if there is an entrance/exit at the end - imageId = SPR_STATION_LIGHT_BACK_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 23, 31, 8, 1, 7, height + 7, get_current_rotation()); - } - - //height -= 7 (height) - track_paint_util_draw_station_covers(EDGE_SW, hasFence, entranceStyle, direction, height); - //height += 7 (height + 7) - - if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 3) { - imageId = SPR_STATION_FENCE_SMALL_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 0, 31, 8, 1, 7, height + 7, get_current_rotation()); - } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 1) { - imageId = SPR_STATION_LIGHT_BACK_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); - sub_98196C(imageId, 0, 31, 8, 1, 7, height + 7, get_current_rotation()); - } } + track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement); + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index b5acda4af8..127928603a 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -251,6 +251,140 @@ bool track_paint_util_should_paint_supports(rct_xy16 position) return false; } +void track_paint_util_draw_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)}; + rct_ride * ride = get_ride(rideIndex); + const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; + const bool hasGreenLight = (bool) (mapElement->properties.track.sequence & 0x80); + + bool hasFence; + uint32 imageId; + + if (direction == 0 || direction == 2) { + //height += 5 (height + 5); + hasFence = track_paint_util_has_fence(EDGE_NW, position, mapElement, ride, get_current_rotation()); + + if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 0) { + if (hasGreenLight) { + imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_GREEN_LIGHT_SW_NE : SPR_STATION_PLATFORM_END_GREEN_LIGHT_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_RED_LIGHT_SW_NE : SPR_STATION_PLATFORM_END_RED_LIGHT_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); + } + } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 2) { + imageId = (hasFence ? SPR_STATION_PLATFORM_BEGIN_FENCED_SW_NE : SPR_STATION_PLATFORM_BEGIN_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_SW_NE : SPR_STATION_PLATFORM_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); + } + sub_98196C(imageId, 0, 0, 32, 8, 1, height + 5, get_current_rotation()); + //height -= 5 (height) + track_paint_util_draw_station_covers(EDGE_NW, hasFence, entranceStyle, direction, height); + //height += 5 (height + 5) + + if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 0) { + imageId = (hasGreenLight ? SPR_STATION_PLATFORM_END_GREEN_LIGHT_SW_NE : SPR_STATION_PLATFORM_END_RED_LIGHT_SW_NE) | RCT2_GLOBAL(0x00F4419C, uint32); + } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 2) { + imageId = SPR_STATION_PLATFORM_BEGIN_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = SPR_STATION_PLATFORM_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); + } + sub_98196C(imageId, 0, 24, 32, 8, 1, height + 5, get_current_rotation()); + //height += 2 (height + 7) + + hasFence = track_paint_util_has_fence(EDGE_SE, position, mapElement, ride, get_current_rotation()); + if (hasFence) { + if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 0) { + imageId = SPR_STATION_BEGIN_ANGLE_FENCE_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); + } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 2) { + imageId = SPR_STATION_LIGHT_BACK_ANGLE_FENCED_NE_SW | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = SPR_STATION_FENCE_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); + } + sub_98196C(imageId, 0, 31, 32, 1, 7, height + 7, get_current_rotation()); + } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 0) { + // Addition: draw only small fence if there is an entrance/exit at the beginning + imageId = SPR_STATION_FENCE_SMALL_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 31, 23, 1, 8, 7, height + 7, get_current_rotation()); + } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 2) { + // Addition: draw only small fence if there is an entrance/exit at the end + imageId = SPR_STATION_LIGHT_BACK_NE_SW | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 31, 23, 1, 8, 7, height + 7, get_current_rotation()); + } + //height -= 7 (height) + track_paint_util_draw_station_covers(EDGE_SE, hasFence, entranceStyle, direction, height); + //height += 7 (height + 7) + + if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 0) { + imageId = SPR_STATION_FENCE_SMALL_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 31, 0, 1, 8, 7, height + 7, get_current_rotation()); + } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 2) { + imageId = SPR_STATION_LIGHT_BACK_NE_SW | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 31, 0, 1, 8, 7, height + 7, get_current_rotation()); + } + } else if (direction == 1 || direction == 3) { + //height += 5 (height + 5); + hasFence = track_paint_util_has_fence(EDGE_NE, position, mapElement, ride, get_current_rotation()); + + if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 3) { + if (hasGreenLight) { + imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_GREEN_LIGHT_NW_SE : SPR_STATION_PLATFORM_END_GREEN_LIGHT_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_END_RED_LIGHT_NW_SE : SPR_STATION_PLATFORM_END_RED_LIGHT_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); + } + } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 1) { + imageId = (hasFence ? SPR_STATION_PLATFORM_BEGIN_FENCED_NW_SE : SPR_STATION_PLATFORM_BEGIN_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_NW_SE : SPR_STATION_PLATFORM_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); + } + sub_98196C(imageId, 0, 0, 8, 32, 1, height + 5, get_current_rotation()); + //height -= 5 (height) + track_paint_util_draw_station_covers(EDGE_NE, hasFence, entranceStyle, direction, height); + //height += 5 (height + 5) + + if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 3) { + imageId = (hasGreenLight ? SPR_STATION_PLATFORM_END_GREEN_LIGHT_NW_SE : SPR_STATION_PLATFORM_END_RED_LIGHT_NW_SE) | RCT2_GLOBAL(0x00F4419C, uint32); + } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 1) { + imageId = SPR_STATION_PLATFORM_BEGIN_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = SPR_STATION_PLATFORM_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + } + sub_98196C(imageId, 24, 0, 8, 32, 1, height + 5, get_current_rotation()); + //height += 2 (height + 7) + + hasFence = track_paint_util_has_fence(EDGE_SW, position, mapElement, ride, get_current_rotation()); + if (hasFence) { + if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 3) { + imageId = SPR_STATION_BEGIN_ANGLE_FENCE_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 1) { + imageId = SPR_STATION_LIGHT_BACK_ANGLE_FENCED_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + } else { + imageId = SPR_STATION_FENCE_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + } + sub_98196C(imageId, 31, 0, 1, 32, 7, height + 7, get_current_rotation()); + } else if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 3) { + // Addition: draw only small fence if there is an entrance/exit at the beginning + imageId = SPR_STATION_FENCE_SMALL_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 23, 31, 8, 1, 7, height + 7, get_current_rotation()); + } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 1) { + // Addition: draw only small fence if there is an entrance/exit at the end + imageId = SPR_STATION_LIGHT_BACK_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 23, 31, 8, 1, 7, height + 7, get_current_rotation()); + } + + //height -= 7 (height) + track_paint_util_draw_station_covers(EDGE_SW, hasFence, entranceStyle, direction, height); + //height += 7 (height + 7) + + if (mapElement->properties.track.type == TRACK_ELEM_BEGIN_STATION && direction == 3) { + imageId = SPR_STATION_FENCE_SMALL_SW_NE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 0, 31, 8, 1, 7, height + 7, get_current_rotation()); + } else if (mapElement->properties.track.type == TRACK_ELEM_END_STATION && direction == 1) { + imageId = SPR_STATION_LIGHT_BACK_NW_SE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 0, 31, 8, 1, 7, height + 7, get_current_rotation()); + } + } +} + bool track_paint_util_draw_station_covers(enum edge edge, bool hasFence, const rct_ride_entrance_definition * entranceStyle, uint8 direction, uint16 height) { if (!(RCT2_GLOBAL(0x0141E9DB, uint8) & 3)) { diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index 6a1436cd21..2b1c44f7d3 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -165,6 +165,7 @@ bool track_paint_util_has_fence(enum edge edge, rct_xy16 position, rct_map_eleme void track_paint_util_paint_floor(uint8 edges, uint32 colourFlags, uint16 height, const uint32 floorSprites[4], uint8 rotation); void track_paint_util_paint_fences(uint8 edges, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation); bool track_paint_util_draw_station_covers(enum edge edge, bool hasFence, const rct_ride_entrance_definition * entranceStyle, uint8 direction, uint16 height); +void track_paint_util_draw_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement); bool track_paint_util_should_paint_supports(rct_xy16 position); void track_paint_util_draw_pier(rct_ride * ride, const rct_ride_entrance_definition * entranceStyle, rct_xy16 position, uint8 direction, int height, rct_map_element * mapElement, uint8 rotation);