diff --git a/src/ride/coaster/junior_roller_coaster.c b/src/ride/coaster/junior_roller_coaster.c index 41a47bc0a2..c6da501b81 100644 --- a/src/ride/coaster/junior_roller_coaster.c +++ b/src/ride/coaster/junior_roller_coaster.c @@ -1897,7 +1897,7 @@ static const sint8 junior_rc_track_right_quarter_turn_5_tiles_support_height_off }; static void junior_rc_right_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { - track_paint_util_right_quarter_turn_5_tiles_paint(1, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), junior_rc_track_pieces_flat_quarter_turn_5_tiles, defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesOffsets, get_current_rotation()); + track_paint_util_right_quarter_turn_5_tiles_paint(1, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), junior_rc_track_pieces_flat_quarter_turn_5_tiles, defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesBoundOffsets, get_current_rotation()); int supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence]; @@ -2035,9 +2035,75 @@ static void junior_rc_right_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trac junior_rc_flat_to_left_bank_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } +const rct_xy16 junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths[4][5] = { + { + {32, 20}, + {32, 16}, + {16, 16}, + {16, 32}, + {20, 32}, + }, + { + {20, 32}, + {16, 32}, + {16, 16}, + {32, 16}, + {32, 20}, + }, + { + {32, 1}, + {32, 16}, + {16, 16}, + {16, 32}, + {1, 32}, + }, + { + {20, 32}, + {16, 32}, + {16, 16}, + {32, 16}, + {32, 20}, + } +}; + +const rct_xyz16 junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets[4][5] = { + { + {0, 6}, + {0, 16}, + {0, 0}, + {16, 0}, + {6, 0}, + }, + { + {6, 0}, + {16, 0}, + {0, 16}, + {0, 0}, + {0, 6}, + }, + { + {0, 27}, + {0, 0, 27}, + {16, 16, 27}, + {0, 0, 27}, + {27, 0}, + }, + { + {6, 0}, + {0, 0}, + {16, 0}, + {0, 16}, + {0, 6}, + } +}; + /* rct2: 0x008AB010, 0x0052304C */ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { - track_paint_util_right_quarter_turn_5_tiles_paint(1, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), junior_rc_track_pieces_banked_quarter_turn_5_tiles, NULL, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesOffsets, get_current_rotation()); + uint8 thickness = 1; + if (direction == 2 && (trackSequence == 0 || trackSequence == 6)) { + thickness = 26; + } + track_paint_util_right_quarter_turn_5_tiles_paint(thickness, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), junior_rc_track_pieces_banked_quarter_turn_5_tiles, NULL, junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths, junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets, get_current_rotation()); if (direction == 1 && trackSequence == 6) { uint32 imageId = SPR_JUNIOR_RC_BANKED_QUARTER_TURN_5_TILES_NW_SW_PART_4_2 | RCT2_GLOBAL(0x00F44198, uint32); @@ -2048,7 +2114,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(uint8 rideIn sub_98197C(imageId, 0, 0, 1, 32, 26, height, 27, 0, height, get_current_rotation()); } - int supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence]; + int supportHeight = height; switch (trackSequence) { case 0: metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, supportHeight, RCT2_GLOBAL(0x00F4419C, uint32)); diff --git a/src/ride/gentle/monorail_cycles.c b/src/ride/gentle/monorail_cycles.c index d636cc8e81..13de6315ac 100644 --- a/src/ride/gentle/monorail_cycles.c +++ b/src/ride/gentle/monorail_cycles.c @@ -284,7 +284,7 @@ static const sint8 monorail_cycles_track_right_quarter_turn_5_tiles_support_spec /** rct2: 0x0088ADB8 */ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - track_paint_util_right_quarter_turn_5_tiles_paint(1, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), monorail_cycles_track_pieces_flat_quarter_turn_5_tiles, NULL, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesOffsets, get_current_rotation()); + track_paint_util_right_quarter_turn_5_tiles_paint(1, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), monorail_cycles_track_pieces_flat_quarter_turn_5_tiles, NULL, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesBoundOffsets, get_current_rotation()); int supportHeight = height + monorail_cycles_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence]; int supportSpecial = monorail_cycles_track_right_quarter_turn_5_tiles_support_special[direction][trackSequence]; diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index 3f1fd739c3..ec9ee4333c 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -932,6 +932,37 @@ const rct_xy16 defaultRightQuarterTurn5TilesOffsets[4][5] = { } }; +const rct_xyz16 defaultRightQuarterTurn5TilesBoundOffsets[4][5] = { + { + {0, 6}, + {0, 16}, + {0, 0}, + {16, 0}, + {6, 0}, + }, + { + {6, 0}, + {16, 0}, + {0, 16}, + {0, 0}, + {0, 6}, + }, + { + {0, 6}, + {0, 0}, + {16, 16}, + {0, 0}, + {6, 0}, + }, + { + {6, 0}, + {0, 0}, + {16, 0}, + {0, 16}, + {0, 6}, + } +}; + const rct_xy16 defaultRightQuarterTurn5TilesBoundLengths[4][5] = { { {32, 20}, @@ -964,7 +995,7 @@ const rct_xy16 defaultRightQuarterTurn5TilesBoundLengths[4][5] = { }; static const sint8 right_quarter_turn_5_tiles_sprite_map[] = {0, -1, 1, 2, -1, 3, 4}; -void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xy16 boundsOffsets[4][5], uint8 rotation) +void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xyz16 boundsOffsets[4][5], uint8 rotation) { int index = right_quarter_turn_5_tiles_sprite_map[trackSequence]; if (index < 0) { @@ -974,9 +1005,9 @@ void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 h uint32 imageId = sprites[direction][index] | colourFlags; rct_xy16 offset = (offsets == NULL ? (rct_xy16){0, 0} : offsets[direction][index]); rct_xy16 boundsLength = boundsLengths[direction][index]; - rct_xy16 boundsOffset = (boundsOffsets == NULL ? offset : boundsOffsets[direction][index]); + rct_xyz16 boundsOffset = (boundsOffsets == NULL ? (rct_xyz16) { .x = offset.x, .y = offset.y, .z = 0 } : boundsOffsets[direction][index]); - sub_98197C(imageId, (sint8) offset.x, (sint8) offset.y, boundsLength.x, boundsLength.y, thickness, height, boundsOffset.x, boundsOffset.y, height, rotation); + sub_98197C(imageId, (sint8) offset.x, (sint8) offset.y, boundsLength.x, boundsLength.y, thickness, height, boundsOffset.x, boundsOffset.y, height + boundsOffset.z, rotation); } void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]) diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index 83e60cff40..56b9bcb0d2 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -181,6 +181,7 @@ extern const uint32 trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile[4]; extern const uint8 mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[]; extern const rct_xy16 defaultRightQuarterTurn5TilesOffsets[4][5]; +extern const rct_xyz16 defaultRightQuarterTurn5TilesBoundOffsets[4][5]; extern const rct_xy16 defaultRightQuarterTurn5TilesBoundLengths[4][5]; extern const uint8 mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[]; @@ -214,7 +215,7 @@ void track_paint_util_draw_station(uint8 rideIndex, uint8 trackSequence, uint8 d 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); -void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xy16 boundsOffsets[4][5], uint8 rotation); +void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xyz16 boundsOffsets[4][5], uint8 rotation); void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]); void track_paint_util_right_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], const rct_xy16 offsets[4][3], const rct_xy16 boundsLengths[4][3], const rct_xyz16 boundsOffsets[4][3], uint8 rotation); void track_paint_util_right_quarter_turn_3_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType);