From 5494dcd0e7c8149890a4b7ad90c701c0835c8591 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sat, 3 Sep 2016 14:48:22 +0100 Subject: [PATCH] Fix jr rc right/left quarter turn 3 tile bank bound boxes --- src/ride/coaster/junior_roller_coaster.c | 75 +++++++++++++++++++++++- src/ride/gentle/ghost_train.c | 2 +- src/ride/track_paint.c | 29 ++++++++- src/ride/track_paint.h | 3 +- 4 files changed, 103 insertions(+), 6 deletions(-) diff --git a/src/ride/coaster/junior_roller_coaster.c b/src/ride/coaster/junior_roller_coaster.c index a2160f1535..41a47bc0a2 100644 --- a/src/ride/coaster/junior_roller_coaster.c +++ b/src/ride/coaster/junior_roller_coaster.c @@ -2619,10 +2619,83 @@ static void junior_rc_left_quarter_turn_3_tiles_paint_setup(uint8 rideIndex, uin junior_rc_right_quarter_turn_3_tiles_paint_setup(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } +const rct_xy16 junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths[4][3] = { + { + {32, 20}, + {16, 16}, + {20, 32}, + }, + { + {20, 32}, + {16, 16}, + {32, 20}, + }, + { + {32, 1}, + {16, 16}, + {1, 32}, + }, + { + {20, 32}, + {16, 16}, + {32, 20}, + } +}; + +const rct_xyz16 junior_rc_right_quarter_turn_3_tiles_bank_offsets[4][3] = { + { + {0, 6}, + {16, 16}, + {6, 0}, + }, + { + {6, 0}, + {16, 0}, + {0, 6}, + }, + { + {0, 27}, + {0, 0, 27}, + {27, 0}, + }, + { + {6, 0}, + {0, 16}, + {0, 6}, + } +}; + /** rct2: 0x008AA0D0, 0x00523EA0, 0x005240CC, 0x0052430F, 0x00524500*/ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - track_paint_util_right_quarter_turn_3_tiles_paint(1, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), junior_rc_track_pieces_banked_quarter_turn_3_tiles, NULL, defaultRightQuarterTurn3TilesBoundLengths, defaultRightQuarterTurn3TilesOffsets, get_current_rotation()); + uint8 thickness[4][4] = { + { + 1, + 1, + 1, + 1 + }, + { + 1, + 1, + 1, + 1 + }, + { + 26, + 1, + 1, + 26 + }, + { + 1, + 1, + 1, + 1 + } + }; + + track_paint_util_right_quarter_turn_3_tiles_paint(thickness[direction][trackSequence], height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), junior_rc_track_pieces_banked_quarter_turn_3_tiles, NULL, junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths, junior_rc_right_quarter_turn_3_tiles_bank_offsets, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(height, direction, trackSequence, TUNNEL_0); if (direction == 1 && trackSequence == 3) { diff --git a/src/ride/gentle/ghost_train.c b/src/ride/gentle/ghost_train.c index c9e474b522..496626d70a 100644 --- a/src/ride/gentle/ghost_train.c +++ b/src/ride/gentle/ghost_train.c @@ -362,7 +362,7 @@ static void paint_ghost_train_station(uint8 rideIndex, uint8 trackSequence, uint /** rct2: 0x00770C9C */ static void paint_ghost_train_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), ghost_train_track_pieces_quarter_turn_3_tiles, NULL, defaultRightQuarterTurn3TilesBoundLengths, defaultRightQuarterTurn3TilesOffsets, get_current_rotation()); + track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), ghost_train_track_pieces_quarter_turn_3_tiles, NULL, defaultRightQuarterTurn3TilesBoundLengths, defaultRightQuarterTurn3TilesBoundOffsets, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(height, direction, trackSequence, TUNNEL_0); switch (trackSequence) { diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index cda975d17c..3f1fd739c3 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -1021,6 +1021,29 @@ const rct_xy16 defaultRightQuarterTurn3TilesOffsets[4][3] = { } }; +const rct_xyz16 defaultRightQuarterTurn3TilesBoundOffsets[4][3] = { + { + {0, 6}, + {16, 16}, + {6, 0}, + }, + { + {6, 0}, + {16, 0}, + {0, 6}, + }, + { + {0, 6}, + {0, 0}, + {6, 0}, + }, + { + {6, 0}, + {0, 16}, + {0, 6}, + } +}; + const rct_xy16 defaultRightQuarterTurn3TilesBoundLengths[4][3] = { { {32, 20}, @@ -1045,7 +1068,7 @@ const rct_xy16 defaultRightQuarterTurn3TilesBoundLengths[4][3] = { }; static const sint8 right_quarter_turn_3_tiles_sprite_map[] = {0, -1, 1, 2}; -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_xy16 boundsOffsets[4][3], uint8 rotation) +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) { int index = right_quarter_turn_3_tiles_sprite_map[trackSequence]; if (index < 0) { @@ -1055,9 +1078,9 @@ void track_paint_util_right_quarter_turn_3_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_3_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType) diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index 2732ad086d..83e60cff40 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -185,6 +185,7 @@ extern const rct_xy16 defaultRightQuarterTurn5TilesBoundLengths[4][5]; extern const uint8 mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[]; extern const rct_xy16 defaultRightQuarterTurn3TilesOffsets[4][3]; +extern const rct_xyz16 defaultRightQuarterTurn3TilesBoundOffsets[4][3]; extern const rct_xy16 defaultRightQuarterTurn3TilesBoundLengths[4][3]; extern const rct_xy16 defaultRightHelixUpSmallQuarterBoundLengths[4][3][2]; @@ -215,7 +216,7 @@ void track_paint_util_draw_pier(rct_ride * ride, const rct_ride_entrance_definit 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_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_xy16 boundsOffsets[4][3], uint8 rotation); +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); void track_paint_util_left_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation); void track_paint_util_left_quarter_turn_3_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence);