From 60bdda7b72066999c40a269787cbde519858533f Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 21 May 2016 22:56:18 +0200 Subject: [PATCH 1/9] Add empty paint functions --- src/ride/coaster/virginia_reel.c | 112 +++++++++++++++++++++++++++++-- src/ride/track_data.c | 2 +- src/ride/track_paint.h | 1 + 3 files changed, 109 insertions(+), 6 deletions(-) diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index e7d5f2de76..e11861a1f9 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -14,12 +14,12 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" -#include "../../config.h" -#include "../../interface/viewport.h" -#include "../../world/sprite.h" -#include "../../paint/paint.h" +#include "../../common.h" +#include "../track_paint.h" +#include "../track.h" #include "../vehicle_paint.h" +#include "../../interface/viewport.h" +#include "../../paint/paint.h" // 0x009927E6: static const vehicle_boundbox _virginiaReelBoundbox[] = { @@ -91,3 +91,105 @@ void vehicle_visual_virginia_reel(int x, int imageDirection, int y, int z, rct_v assert(vehicleEntry->effect_visual == 1); } + +/** rct2: 0x */ +static void paint_viriginia_reel_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** rct2: 0x */ +static void paint_viriginia_reel_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ +} + +/** + * rct2: 0x00811184 + */ +TRACK_PAINT_FUNCTION get_track_paint_function_virginia_reel(int trackType, int direction) +{ + switch (trackType) { + case TRACK_ELEM_FLAT: + return paint_viriginia_reel_track_flat; + + case TRACK_ELEM_END_STATION: + case TRACK_ELEM_BEGIN_STATION: + case TRACK_ELEM_MIDDLE_STATION: + return paint_viriginia_reel_station; + + case TRACK_ELEM_25_DEG_UP: + return paint_viriginia_reel_track_25_deg_up; + case TRACK_ELEM_FLAT_TO_25_DEG_UP: + return paint_viriginia_reel_track_flat_to_25_deg_up; + case TRACK_ELEM_25_DEG_UP_TO_FLAT: + return paint_viriginia_reel_track_25_deg_up_to_flat; + + case TRACK_ELEM_25_DEG_DOWN: + return paint_viriginia_reel_track_25_deg_down; + case TRACK_ELEM_FLAT_TO_25_DEG_DOWN: + return paint_viriginia_reel_track_flat_to_25_deg_down; + case TRACK_ELEM_25_DEG_DOWN_TO_FLAT: + return paint_viriginia_reel_track_25_deg_down_to_flat; + + case TRACK_ELEM_LEFT_QUARTER_TURN_3_TILES: + return paint_viriginia_reel_track_left_quarter_turn_3_tiles; + case TRACK_ELEM_RIGHT_QUARTER_TURN_3_TILES: + return paint_viriginia_reel_track_right_quarter_turn_3_tiles; + + case TRACK_ELEM_LEFT_QUARTER_TURN_1_TILE: + return paint_viriginia_reel_track_left_quarter_turn_1_tile; + case TRACK_ELEM_RIGHT_QUARTER_TURN_1_TILE: + return paint_viriginia_reel_track_right_quarter_turn_1_tile; + } + + return NULL; +} \ No newline at end of file diff --git a/src/ride/track_data.c b/src/ride/track_data.c index d2c0f0f4b5..078250d2e7 100644 --- a/src/ride/track_data.c +++ b/src/ride/track_data.c @@ -5621,7 +5621,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = { 0, // RIDE_TYPE_38 0, // RIDE_TYPE_FLYING_ROLLER_COASTER 0, // RIDE_TYPE_3A - 0, // RIDE_TYPE_VIRGINIA_REEL + get_track_paint_function_virginia_reel, // RIDE_TYPE_VIRGINIA_REEL 0, // RIDE_TYPE_SPLASH_BOATS get_track_paint_function_mini_helicopters, // RIDE_TYPE_MINI_HELICOPTERS 0, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index 9fe3ab71c9..8cd90b8967 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -198,6 +198,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_facility(int trackType, int direct TRACK_PAINT_FUNCTION get_track_paint_function_twist(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_haunted_house(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(int trackType, int direction); +TRACK_PAINT_FUNCTION get_track_paint_function_virginia_reel(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_mini_helicopters(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_roto_drop(int trackType, int direction); From 0522241b01684790d6b0c7fd2a95b411f4a42a5e Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 21 May 2016 23:18:04 +0200 Subject: [PATCH 2/9] Draw flat track --- src/ride/coaster/virginia_reel.c | 46 +++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index e11861a1f9..cee27b3d10 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -20,6 +20,7 @@ #include "../vehicle_paint.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" +#include "../../paint/supports.h" // 0x009927E6: static const vehicle_boundbox _virginiaReelBoundbox[] = { @@ -34,6 +35,31 @@ static const vehicle_boundbox _virginiaReelBoundbox[] = { { -11, -11, 1, 22, 22, 13 }, }; +enum +{ + SPR_VIRGINIA_REEL_FLAT_SW_NE = 21458, + SPR_VIRGINIA_REEL_FLAT_NW_SE = 21459, + + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE = 21488, + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE = 21489, + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NE_SW = 21490, + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SE_NW = 21491, +}; + +static const uint32 virginia_reel_track_pieces_flat[4] = { + SPR_VIRGINIA_REEL_FLAT_SW_NE, + SPR_VIRGINIA_REEL_FLAT_NW_SE, + SPR_VIRGINIA_REEL_FLAT_SW_NE, + SPR_VIRGINIA_REEL_FLAT_NW_SE, +}; + +static const uint32 virginia_reel_track_pieces_flat_lift_hill[4] = { + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE, + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE, + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NE_SW, + SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SE_NW, +}; + /** * * rct2: 0x006D5B48 @@ -92,9 +118,27 @@ void vehicle_visual_virginia_reel(int x, int imageDirection, int y, int z, rct_v assert(vehicleEntry->effect_visual == 1); } -/** rct2: 0x */ +/** rct2: 0x00811264 */ static void paint_viriginia_reel_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + const uint32 * sprites = virginia_reel_track_pieces_flat; + if (mapElement->type & 0x80) { + sprites = virginia_reel_track_pieces_flat_lift_hill; + } + + uint32 imageId = sprites[direction] | RCT2_GLOBAL(0x00F44198, uint32); + if (direction & 1) { + sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); + paint_util_push_tunnel_right(height, TUNNEL_0); + } else { + sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); + paint_util_push_tunnel_left(height, TUNNEL_0); + } + + wooden_a_supports_paint_setup((direction & 1), 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 32, 0x20); } /** rct2: 0x */ From 447dc19db5d8223504407d568f352ca57fa389fd Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 21 May 2016 23:40:24 +0200 Subject: [PATCH 3/9] Draw flat-up / down-flat --- src/ride/coaster/virginia_reel.c | 67 +++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index cee27b3d10..fe3fee72da 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -39,11 +39,19 @@ enum { SPR_VIRGINIA_REEL_FLAT_SW_NE = 21458, SPR_VIRGINIA_REEL_FLAT_NW_SE = 21459, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SW_NE = 21460, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NW_SE = 21461, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NE_SW = 21462, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SE_NW = 21463, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE = 21488, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE = 21489, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NE_SW = 21490, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SE_NW = 21491, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SW_NE = 21492, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NW_SE = 21493, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NE_SW = 21494, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SE_NW = 21495, }; static const uint32 virginia_reel_track_pieces_flat[4] = { @@ -60,6 +68,20 @@ static const uint32 virginia_reel_track_pieces_flat_lift_hill[4] = { SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SE_NW, }; +static const uint32 virginia_reel_track_pieces_flat_to_25_deg_up[4] = { + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SW_NE, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NW_SE, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NE_SW, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SE_NW, +}; + +static const uint32 virginia_reel_track_pieces_flat_to_25_deg_up_lift_hill[4] = { + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SW_NE, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NW_SE, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NE_SW, + SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SE_NW, +}; + /** * * rct2: 0x006D5B48 @@ -146,9 +168,49 @@ static void paint_viriginia_reel_track_25_deg_up(uint8 rideIndex, uint8 trackSeq { } -/** rct2: 0x */ +/** rct2: 0x00811294 */ static void paint_viriginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + const uint32 * sprites = virginia_reel_track_pieces_flat_to_25_deg_up; + if (mapElement->type & 0x80) { + sprites = virginia_reel_track_pieces_flat_to_25_deg_up_lift_hill; + } + + uint32 imageId = sprites[direction] | RCT2_GLOBAL(0x00F44198, uint32); + paint_struct * ps; + switch (direction) { + case 0: + sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); + + wooden_a_supports_paint_setup(0, 1, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height, TUNNEL_6); + break; + case 1: + ps = sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); + RCT2_GLOBAL(0x009DEA58, paint_struct*) = ps; + + wooden_a_supports_paint_setup(1, 2, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height, TUNNEL_8); + break; + case 2: + ps = sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); + RCT2_GLOBAL(0x009DEA58, paint_struct*) = ps; + + wooden_a_supports_paint_setup(0, 3, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height, TUNNEL_8); + break; + case 3: + sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); + + wooden_a_supports_paint_setup(1, 4, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height, TUNNEL_6); + break; + } + + wooden_a_supports_paint_setup((direction & 1), 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 48, 0x20); } /** rct2: 0x */ @@ -166,9 +228,10 @@ static void paint_viriginia_reel_track_flat_to_25_deg_down(uint8 rideIndex, uint { } -/** rct2: 0x */ +/** rct2: 0x008112C4 */ static void paint_viriginia_reel_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + paint_viriginia_reel_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x */ From 914a320dae200b18e7f4a03c7468b83729040a5a Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 21 May 2016 23:50:49 +0200 Subject: [PATCH 4/9] Draw up-flat / flat-down --- src/ride/coaster/virginia_reel.c | 66 +++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index fe3fee72da..66eb5d4f00 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -43,6 +43,10 @@ enum SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NW_SE = 21461, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NE_SW = 21462, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SE_NW = 21463, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SW_NE = 21464, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NW_SE = 21465, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NE_SW = 21466, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SE_NW = 21467, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE = 21488, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE = 21489, @@ -52,6 +56,10 @@ enum SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NW_SE = 21493, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NE_SW = 21494, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SE_NW = 21495, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SW_NE = 21496, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NW_SE = 21497, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NE_SW = 21498, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SE_NW = 21499, }; static const uint32 virginia_reel_track_pieces_flat[4] = { @@ -82,6 +90,20 @@ static const uint32 virginia_reel_track_pieces_flat_to_25_deg_up_lift_hill[4] = SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SE_NW, }; +static const uint32 virginia_reel_track_pieces_25_deg_up_to_flat[4] = { + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SW_NE, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NW_SE, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NE_SW, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SE_NW, +}; + +static const uint32 virginia_reel_track_pieces_25_deg_up_to_flat_lift_hill[4] = { + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SW_NE, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NW_SE, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NE_SW, + SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SE_NW, +}; + /** * * rct2: 0x006D5B48 @@ -213,9 +235,48 @@ static void paint_viriginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 paint_util_set_general_support_height(height + 48, 0x20); } -/** rct2: 0x */ +/** rct2: 0x00811294 */ static void paint_viriginia_reel_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + const uint32 * sprites = virginia_reel_track_pieces_25_deg_up_to_flat; + if (mapElement->type & 0x80) { + sprites = virginia_reel_track_pieces_25_deg_up_to_flat_lift_hill; + } + + uint32 imageId = sprites[direction] | RCT2_GLOBAL(0x00F44198, uint32); + paint_struct * ps; + + if (direction & 1) { + ps = sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); + } else { + ps = sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); + } + + if (direction == 1 || direction == 2) { + RCT2_GLOBAL(0x009DEA58, paint_struct*) = ps; + } + + switch (direction) { + case 0: + wooden_a_supports_paint_setup(0, 5, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height - 8, TUNNEL_6); + break; + case 1: + wooden_a_supports_paint_setup(1, 6, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height + 8, TUNNEL_14); + break; + case 2: + wooden_a_supports_paint_setup(0, 7, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height + 8, TUNNEL_14); + break; + case 3: + wooden_a_supports_paint_setup(1, 8, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height - 8, TUNNEL_6); + break; + } + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 40, 0x20); } /** rct2: 0x */ @@ -223,9 +284,10 @@ static void paint_viriginia_reel_track_25_deg_down(uint8 rideIndex, uint8 trackS { } -/** rct2: 0x */ +/** rct2: 0x008112B4 */ static void paint_viriginia_reel_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + paint_viriginia_reel_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112C4 */ From b8218a0546b7db9a362b3126515a23bc2e697953 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 21 May 2016 23:59:12 +0200 Subject: [PATCH 5/9] Draw upwards/downwards track --- src/ride/coaster/virginia_reel.c | 66 +++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index 66eb5d4f00..ee794fc3eb 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -47,6 +47,10 @@ enum SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NW_SE = 21465, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NE_SW = 21466, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SE_NW = 21467, + SPR_VIRGINIA_REEL_25_DEG_UP_SW_NE = 21468, + SPR_VIRGINIA_REEL_25_DEG_UP_NW_SE = 21469, + SPR_VIRGINIA_REEL_25_DEG_UP_NE_SW = 21470, + SPR_VIRGINIA_REEL_25_DEG_UP_SE_NW = 21471, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE = 21488, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE = 21489, @@ -60,6 +64,10 @@ enum SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NW_SE = 21497, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NE_SW = 21498, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SE_NW = 21499, + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SW_NE = 21500, + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NW_SE = 21501, + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NE_SW = 21502, + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW = 21503, }; static const uint32 virginia_reel_track_pieces_flat[4] = { @@ -104,6 +112,20 @@ static const uint32 virginia_reel_track_pieces_25_deg_up_to_flat_lift_hill[4] = SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SE_NW, }; +static const uint32 virginia_reel_track_pieces_25_deg_up[4] = { + SPR_VIRGINIA_REEL_25_DEG_UP_SW_NE, + SPR_VIRGINIA_REEL_25_DEG_UP_NW_SE, + SPR_VIRGINIA_REEL_25_DEG_UP_NE_SW, + SPR_VIRGINIA_REEL_25_DEG_UP_SE_NW, +}; + +static const uint32 virginia_reel_track_pieces_25_deg_up_lift_hill[4] = { + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SW_NE, + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NW_SE, + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NE_SW, + SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW, +}; + /** * * rct2: 0x006D5B48 @@ -185,9 +207,48 @@ static void paint_viriginia_reel_track_flat(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } -/** rct2: 0x */ +/** rct2: 0x00811274 */ static void paint_viriginia_reel_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + const uint32 * sprites = virginia_reel_track_pieces_25_deg_up; + if (mapElement->type & 0x80) { + sprites = virginia_reel_track_pieces_25_deg_up_lift_hill; + } + + uint32 imageId = sprites[direction] | RCT2_GLOBAL(0x00F44198, uint32); + paint_struct * ps; + + if (direction & 1) { + ps = sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); + } else { + ps = sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); + } + + if (direction == 1 || direction == 2) { + RCT2_GLOBAL(0x009DEA58, paint_struct*) = ps; + } + + switch (direction) { + case 0: + wooden_a_supports_paint_setup(0, 9, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height - 8, TUNNEL_7); + break; + case 1: + wooden_a_supports_paint_setup(1, 10, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height + 8, TUNNEL_8); + break; + case 2: + wooden_a_supports_paint_setup(0, 11, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height + 8, TUNNEL_8); + break; + case 3: + wooden_a_supports_paint_setup(1, 12, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height - 8, TUNNEL_7); + break; + } + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x00811294 */ @@ -279,9 +340,10 @@ static void paint_viriginia_reel_track_25_deg_up_to_flat(uint8 rideIndex, uint8 paint_util_set_general_support_height(height + 40, 0x20); } -/** rct2: 0x */ +/** rct2: 0x008112A4 */ static void paint_viriginia_reel_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + paint_viriginia_reel_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112B4 */ From 0ff972a0d6854bb139e2f9fd64698256d881ec30 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 22 May 2016 00:13:06 +0200 Subject: [PATCH 6/9] Draw 1-tile turns --- src/ride/coaster/virginia_reel.c | 40 ++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index ee794fc3eb..68b5f288f3 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -52,6 +52,10 @@ enum SPR_VIRGINIA_REEL_25_DEG_UP_NE_SW = 21470, SPR_VIRGINIA_REEL_25_DEG_UP_SE_NW = 21471, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SW_NW = 21484, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NW_NE = 21485, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NE_SE = 21486, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SE_SW = 21487, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE = 21488, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE = 21489, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NE_SW = 21490, @@ -126,6 +130,13 @@ static const uint32 virginia_reel_track_pieces_25_deg_up_lift_hill[4] = { SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW, }; +static const uint32 virginia_reel_track_pieces_flat_quarter_turn_1_tile[4] = { + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SW_NW, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NW_NE, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NE_SE, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SE_SW, +}; + /** * * rct2: 0x006D5B48 @@ -373,14 +384,39 @@ static void paint_viriginia_reel_track_right_quarter_turn_3_tiles(uint8 rideInde { } -/** rct2: 0x */ +/** rct2: 0x00811324 */ static void paint_viriginia_reel_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + track_paint_util_left_quarter_turn_1_tile_paint(2, height, 0, direction, RCT2_GLOBAL(0x00F44198, uint32), virginia_reel_track_pieces_flat_quarter_turn_1_tile, get_current_rotation()); + + switch (direction) { + case 0: + wooden_a_supports_paint_setup(5, 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height, TUNNEL_6); + break; + case 1: + wooden_a_supports_paint_setup(2, 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_left(height, TUNNEL_6); + break; + case 2: + wooden_a_supports_paint_setup(3, 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height, TUNNEL_6); + break; + case 3: + wooden_a_supports_paint_setup(4, 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_push_tunnel_right(height, TUNNEL_6); + paint_util_push_tunnel_left(height, TUNNEL_6); + break; + } + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 32, 0x20); } -/** rct2: 0x */ +/** rct2: 0x00811334 */ static void paint_viriginia_reel_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + paint_viriginia_reel_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /** From e95aefe15c5ccc720029d4efdcc9463d0c1eb7e7 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 22 May 2016 00:30:56 +0200 Subject: [PATCH 7/9] Draw 3-tile turns --- src/ride/coaster/virginia_reel.c | 61 ++++++++++++++++++++++++++++-- src/ride/gentle/mini_helicopters.c | 2 +- src/ride/track_paint.c | 26 ++++++------- src/ride/track_paint.h | 2 +- src/ride/water/submarine_ride.c | 2 +- 5 files changed, 74 insertions(+), 19 deletions(-) diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index 68b5f288f3..5693006199 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -51,7 +51,18 @@ enum SPR_VIRGINIA_REEL_25_DEG_UP_NW_SE = 21469, SPR_VIRGINIA_REEL_25_DEG_UP_NE_SW = 21470, SPR_VIRGINIA_REEL_25_DEG_UP_SE_NW = 21471, - + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0 = 21472, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1 = 21473, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 = 21474, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0 = 21475, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1 = 21476, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2 = 21477, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0 = 21478, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1 = 21479, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2 = 21480, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0 = 21481, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1 = 21482, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 = 21483, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SW_NW = 21484, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NW_NE = 21485, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NE_SE = 21486, @@ -130,6 +141,29 @@ static const uint32 virginia_reel_track_pieces_25_deg_up_lift_hill[4] = { SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW, }; +static const uint32 virginia_reel_track_pieces_flat_quarter_turn_3_tiles[4][3] = { + { + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 + }, + { + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2 + }, + { + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2 + }, + { + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1, + SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 + } +}; + static const uint32 virginia_reel_track_pieces_flat_quarter_turn_1_tile[4] = { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SW_NW, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NW_NE, @@ -374,14 +408,35 @@ static void paint_viriginia_reel_station(uint8 rideIndex, uint8 trackSequence, u { } -/** rct2: 0x */ +static const uint8 virginia_reel_left_quarter_turn_supports[] = {5, 2, 3, 4}; + +/** rct2: 0x00811304 */ static void paint_viriginia_reel_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + track_paint_util_left_quarter_turn_3_tiles_paint(2, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), virginia_reel_track_pieces_flat_quarter_turn_3_tiles, get_current_rotation()); + track_paint_util_left_quarter_turn_3_tiles_tunnel(height - 16, direction, trackSequence); + + switch (trackSequence) { + case 2: + paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0); + break; + case 0: + case 3: + wooden_a_supports_paint_setup(virginia_reel_left_quarter_turn_supports[direction], 0, height, RCT2_GLOBAL(0x00F4419C, uint32), NULL); + paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0); + break; + } + + paint_util_set_general_support_height(height + 32, 0x20); } -/** rct2: 0x */ +static const uint8 right_quarter_turn_3_tiles_to_left_turn_map[] = {3, 1, 2, 0}; + +/** rct2: 0x00811314 */ static void paint_viriginia_reel_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { + trackSequence = right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; + paint_viriginia_reel_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x00811324 */ diff --git a/src/ride/gentle/mini_helicopters.c b/src/ride/gentle/mini_helicopters.c index 38debabfad..3f4b447050 100644 --- a/src/ride/gentle/mini_helicopters.c +++ b/src/ride/gentle/mini_helicopters.c @@ -342,7 +342,7 @@ static void paint_mini_helicopters_track_25_deg_down_to_flat(uint8 rideIndex, ui /** rct2: 0x0081F3E8 */ static void paint_mini_helicopters_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - track_paint_util_left_quarter_turn_3_tiles_paint(height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation()); + track_paint_util_left_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation()); track_paint_util_left_quarter_turn_3_tiles_tunnel(height, direction, trackSequence); switch (trackSequence) { diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index 4d2cb28cf9..b5acda4af8 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -350,7 +350,7 @@ void track_paint_util_draw_pier(rct_ride * ride, const rct_ride_entrance_definit } static const sint8 left_quarter_turn_3_tiles_sprite_map[] = {2, -1, 1, 0}; -void track_paint_util_left_quarter_turn_3_tiles_paint(sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation) +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) { sint8 sprite = left_quarter_turn_3_tiles_sprite_map[trackSequence]; if (sprite < 0) { @@ -362,33 +362,33 @@ void track_paint_util_left_quarter_turn_3_tiles_paint(sint16 height, int directi switch (direction) { case 0: switch (trackSequence) { - case 0: sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, rotation); break; - case 2: sub_98197C(imageId, 0, 0, 16, 16, 3, height, 16, 0, height, rotation); break; - case 3: sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, rotation); break; + case 0: sub_98197C(imageId, 0, 0, 32, 20, thickness, height, 0, 6, height, rotation); break; + case 2: sub_98197C(imageId, 0, 0, 16, 16, thickness, height, 16, 0, height, rotation); break; + case 3: sub_98197C(imageId, 0, 0, 20, 32, thickness, height, 6, 0, height, rotation); break; } break; case 1: switch (trackSequence) { - case 0: sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, rotation); break; - case 2: sub_98197C(imageId, 0, 0, 16, 16, 3, height, 0, 0, height, rotation); break; - case 3: sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, rotation); break; + case 0: sub_98197C(imageId, 0, 0, 20, 32, thickness, height, 6, 0, height, rotation); break; + case 2: sub_98197C(imageId, 0, 0, 16, 16, thickness, height, 0, 0, height, rotation); break; + case 3: sub_98197C(imageId, 0, 0, 32, 20, thickness, height, 0, 6, height, rotation); break; } break; case 2: switch (trackSequence) { - case 0: sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, rotation); break; - case 2: sub_98197C(imageId, 0, 0, 16, 16, 3, height, 0, 16, height, rotation); break; - case 3: sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, rotation); break; + case 0: sub_98197C(imageId, 0, 0, 32, 20, thickness, height, 0, 6, height, rotation); break; + case 2: sub_98197C(imageId, 0, 0, 16, 16, thickness, height, 0, 16, height, rotation); break; + case 3: sub_98197C(imageId, 0, 0, 20, 32, thickness, height, 6, 0, height, rotation); break; } break; case 3: switch (trackSequence) { - case 0: sub_98197C(imageId, 0, 0, 20, 32, 3, height, 6, 0, height, rotation); break; - case 2: sub_98197C(imageId, 0, 0, 16, 16, 3, height, 16, 16, height, rotation); break; - case 3: sub_98197C(imageId, 0, 0, 32, 20, 3, height, 0, 6, height, rotation); break; + case 0: sub_98197C(imageId, 0, 0, 20, 32, thickness, height, 6, 0, height, rotation); break; + case 2: sub_98197C(imageId, 0, 0, 16, 16, thickness, height, 16, 16, height, rotation); break; + case 3: sub_98197C(imageId, 0, 0, 32, 20, thickness, height, 0, 6, height, rotation); break; } break; } diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index 8cd90b8967..6a1436cd21 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -168,7 +168,7 @@ bool track_paint_util_draw_station_covers(enum edge edge, bool hasFence, const r 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_left_quarter_turn_3_tiles_paint(sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation); +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); void track_paint_util_left_quarter_turn_1_tile_paint(sint8 thickness, sint16 height, sint16 boundBoxZOffset, int direction, uint32 colourFlags, const uint32 * sprites, uint8 rotation); void track_paint_util_left_quarter_turn_1_tile_tunnel(sint16 height, uint8 direction, uint8 trackSequence); diff --git a/src/ride/water/submarine_ride.c b/src/ride/water/submarine_ride.c index d3a87eb4a9..963cb67d0e 100644 --- a/src/ride/water/submarine_ride.c +++ b/src/ride/water/submarine_ride.c @@ -118,7 +118,7 @@ static void submarine_ride_paint_track_flat(uint8 rideIndex, uint8 trackSequence static void submarine_ride_paint_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { - track_paint_util_left_quarter_turn_3_tiles_paint(height - 16, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation()); + track_paint_util_left_quarter_turn_3_tiles_paint(3, height - 16, direction, trackSequence, RCT2_GLOBAL(0x00F44198, uint32), trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation()); track_paint_util_left_quarter_turn_3_tiles_tunnel(height - 16, direction, trackSequence); switch (trackSequence) { From c4d2a3f7ae9f3ceeb986192d99707a945dc76b26 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 22 May 2016 01:21:51 +0200 Subject: [PATCH 8/9] Draw station --- src/ride/coaster/virginia_reel.c | 27 +++++- src/ride/gentle/mini_helicopters.c | 136 +---------------------------- src/ride/track_paint.c | 134 ++++++++++++++++++++++++++++ src/ride/track_paint.h | 1 + 4 files changed, 164 insertions(+), 134 deletions(-) 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); From 783715cc7b4ae5679b717ee01030c7fb9faa0f36 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 22 May 2016 01:25:12 +0200 Subject: [PATCH 9/9] Fix wrong height of station covers --- src/ride/track_paint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index 127928603a..ff56497844 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -405,12 +405,12 @@ bool track_paint_util_draw_station_covers(enum edge edge, bool hasFence, const r break; case EDGE_SE: bounds = (rct_xyz16) {32, 32, 0}; - boundsOffset = (rct_xyz16) {1, 0, height + 31}; + boundsOffset = (rct_xyz16) {1, 0, height + 23}; imageOffset = SPR_STATION_COVER_OFFSET_NE_SW_FRONT; break; case EDGE_SW: bounds = (rct_xyz16) {32, 32, 0}; - boundsOffset = (rct_xyz16) {0, 0, height + 31}; + boundsOffset = (rct_xyz16) {0, 0, height + 23}; imageOffset = SPR_STATION_COVER_OFFSET_SE_NW_FRONT; break; case EDGE_NW: