mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix stand up roller coaster painting
This commit is contained in:
parent
425cf76b5d
commit
e902d5d82f
|
@ -66,6 +66,28 @@ static void stand_up_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
|
|||
paint_util_set_general_support_height(height + 32, 0x20);
|
||||
}
|
||||
|
||||
static void stand_up_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
|
||||
{
|
||||
static const uint32 imageIds[4][3] = {
|
||||
{ 25567, 25571, SPR_STATION_BASE_A_SW_NE },
|
||||
{ 25568, 25572, SPR_STATION_BASE_A_NW_SE },
|
||||
{ 25567, 25571, SPR_STATION_BASE_A_SW_NE },
|
||||
{ 25568, 25572, SPR_STATION_BASE_A_NW_SE },
|
||||
};
|
||||
|
||||
if (mapElement->properties.track.type == TRACK_ELEM_END_STATION) {
|
||||
sub_98197C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 6, height + 3);
|
||||
} else {
|
||||
sub_98197C_rotated(direction, imageIds[direction][0] | gTrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 6, height + 3);
|
||||
}
|
||||
sub_98196C_rotated(direction, imageIds[direction][2] | 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_2(rideIndex, trackSequence, direction, height, mapElement, 9, 11);
|
||||
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 stand_up_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
|
||||
{
|
||||
if (track_element_is_lift_hill(mapElement)) {
|
||||
|
@ -3305,32 +3327,27 @@ static void stand_up_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence
|
|||
metal_a_supports_paint_setup(0, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
metal_a_supports_paint_setup(0, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25229, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
|
||||
sub_98196C_rotated(direction, gTrackColours[SCHEME_MISC] | 25623, 26, 0, 1, 1, 19, height + 3);
|
||||
break;
|
||||
case 1:
|
||||
sub_98196C_rotated(direction, 0x20000000 | 22432, 0, 0, 32, 32, 1, height);
|
||||
metal_a_supports_paint_setup(0, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
metal_a_supports_paint_setup(0, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25230, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
|
||||
sub_98196C_rotated(direction, gTrackColours[SCHEME_MISC] | 25624, 6, 0, 1, 1, 19, height + 3);
|
||||
break;
|
||||
case 2:
|
||||
sub_98196C_rotated(direction, 0x20000000 | 22432, 0, 0, 32, 32, 1, height);
|
||||
metal_a_supports_paint_setup(0, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
metal_a_supports_paint_setup(0, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25229, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
|
||||
sub_98196C_rotated(direction, gTrackColours[SCHEME_MISC] | 25625, 6, 0, 1, 1, 19, height + 3);
|
||||
break;
|
||||
case 3:
|
||||
sub_98196C_rotated(direction, 0x20000000 | 22432, 0, 0, 32, 32, 1, height);
|
||||
metal_a_supports_paint_setup(0, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
metal_a_supports_paint_setup(0, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
|
||||
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25230, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
|
||||
sub_98196C_rotated(direction, gTrackColours[SCHEME_MISC] | 25626, 26, 0, 1, 1, 19, height + 3);
|
||||
break;
|
||||
}
|
||||
sub_98196C_rotated(direction, 0x00000000, 0, 0, 0, 0, 0, height - 48);
|
||||
sub_98196C_rotated(direction, 0x00000000, 0, 0, 0, 0, 0, height - 48);
|
||||
track_paint_util_onride_photo_paint(direction, height + 3, mapElement);
|
||||
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
|
||||
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
|
||||
paint_util_set_general_support_height(height + 48, 0x20);
|
||||
|
@ -5707,6 +5724,10 @@ TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(int trackType, int dir
|
|||
switch (trackType) {
|
||||
case TRACK_ELEM_FLAT:
|
||||
return stand_up_rc_track_flat;
|
||||
case TRACK_ELEM_END_STATION:
|
||||
case TRACK_ELEM_BEGIN_STATION:
|
||||
case TRACK_ELEM_MIDDLE_STATION:
|
||||
return stand_up_rc_track_station;
|
||||
case TRACK_ELEM_25_DEG_UP:
|
||||
return stand_up_rc_track_25_deg_up;
|
||||
case TRACK_ELEM_60_DEG_UP:
|
||||
|
|
Loading…
Reference in New Issue