diff --git a/src/paint/map_element/entrance.c b/src/paint/map_element/entrance.c index 9316e7784b..9ecc4ccd21 100644 --- a/src/paint/map_element/entrance.c +++ b/src/paint/map_element/entrance.c @@ -46,7 +46,7 @@ void ride_entrance_exit_paint(uint8 direction, int height, rct_map_element* map_ uint8 colour_1, colour_2; uint32 transparant_image_id = 0, image_id = 0; - if (style->flags & (1 << 30)) { + if (style->base_image_id & 0x40000000) { colour_1 = ride->track_colour_main[0] + 0x70; transparant_image_id = (colour_1 << 19) | 0x40000000; } diff --git a/src/paint/map_element/map_element.c b/src/paint/map_element/map_element.c index deba3a7c1b..511ec4c36b 100644 --- a/src/paint/map_element/map_element.c +++ b/src/paint/map_element/map_element.c @@ -314,4 +314,12 @@ void paint_util_set_segment_support_height(int segments, uint16 height, uint8 sl } } } -} \ No newline at end of file +} + +uint16 paint_util_rotate_segments(uint16 segments, uint8 rotation) +{ + uint8 temp = segments & 0xFF; + temp = rol8(temp, rotation * 2); + + return (segments & 0xFF00) | temp; +} diff --git a/src/paint/map_element/map_element.h b/src/paint/map_element/map_element.h index f129a3ccdf..0e13cf8d72 100644 --- a/src/paint/map_element/map_element.h +++ b/src/paint/map_element/map_element.h @@ -49,6 +49,7 @@ extern const int SEGMENTS_ALL; enum { + TUNNEL_0 = 0, TUNNEL_6 = 6, }; @@ -58,6 +59,7 @@ void paint_util_push_tunnel_right(uint16 height, uint8 type); void paint_util_set_general_support_height(sint16 height, uint8 slope); void paint_util_force_set_general_support_height(sint16 height, uint8 slope); void paint_util_set_segment_support_height(int segments, uint16 height, uint8 slope); +uint16 paint_util_rotate_segments(uint16 segments, uint8 rotation); void map_element_paint_setup(int x, int y); diff --git a/src/ride/ride_data.h b/src/ride/ride_data.h index 0ab94c6fde..7ec189ee80 100644 --- a/src/ride/ride_data.h +++ b/src/ride/ride_data.h @@ -32,7 +32,7 @@ typedef struct rct_ride_entrance_definition { uint16 height; uint16 scrolling_mode; rct_string_id string_id; - uint32 flags; + uint32 base_image_id; uint16 colour_use_flags; } rct_ride_entrance_definition; diff --git a/src/ride/track_data.c b/src/ride/track_data.c index b64102aae5..68ed96fcbb 100644 --- a/src/ride/track_data.c +++ b/src/ride/track_data.c @@ -5545,7 +5545,7 @@ const uint32 RideTypeTrackPaintFunctionsOld[91] = { 0x008AF764, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER 0x00890940, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER 0x00898384, // RIDE_TYPE_MAGIC_CARPET - 0x008995D4, // RIDE_TYPE_SUBMARINE_RIDE + 0/*x008995D4*/, // RIDE_TYPE_SUBMARINE_RIDE 0x0089B0C0, // RIDE_TYPE_RIVER_RAFTS 0, // RIDE_TYPE_50 0x008A13B4, // RIDE_TYPE_ENTERPRISE @@ -5640,7 +5640,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = { 0, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER 0, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER 0, // RIDE_TYPE_MAGIC_CARPET - 0, // RIDE_TYPE_SUBMARINE_RIDE + get_track_paint_function_submarine_ride, // RIDE_TYPE_SUBMARINE_RIDE 0, // RIDE_TYPE_RIVER_RAFTS get_track_paint_function_shop, // RIDE_TYPE_50 0, // RIDE_TYPE_ENTERPRISE diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index 80fe203076..5e5d46ab4c 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -119,6 +119,17 @@ const uint32 fenceSpritesRope[] = { SPR_FENCE_ROPE_NW }; +enum +{ + SPR_STATION_COVER_OFFSET_NE_SW_BACK_0 = 0, + SPR_STATION_COVER_OFFSET_NE_SW_BACK_1, + SPR_STATION_COVER_OFFSET_NE_SW_FRONT, + SPR_STATION_COVER_OFFSET_SE_NW_BACK_0, + SPR_STATION_COVER_OFFSET_SE_NW_BACK_1, + SPR_STATION_COVER_OFFSET_SE_NW_FRONT, + SPR_STATION_COVER_OFFSET_HIGH +}; + bool track_paint_util_has_fence(enum edge edge, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint8 rotation) { rct_xy16 offset; @@ -185,6 +196,77 @@ void track_paint_util_paint_fences(uint8 edges, rct_xy16 position, rct_map_eleme } } +/* Supports are only placed every 2 tiles for flat pieces*/ +bool track_paint_util_should_paint_supports(rct_xy16 position) +{ + if ((position.x & (1 << 5)) == (position.y & (1 << 5))) + return true; + + if ((!(position.x & (1 << 5))) && (!(position.y & (1 << 5)))) + return true; + + return false; +} + +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) { + return false; + } + + uint32 imageId; + uint32 baseImageId = entranceStyle->base_image_id; + int imageOffset; + rct_xyz16 offset, bounds, boundsOffset; + + offset = (rct_xyz16) {0, 0, height}; + switch (edge) { + case EDGE_NE: + bounds = (rct_xyz16) {1, 30, 0}; + boundsOffset = (rct_xyz16) {0, 1, height + 1}; + imageOffset = hasFence ? SPR_STATION_COVER_OFFSET_SE_NW_BACK_1 : SPR_STATION_COVER_OFFSET_SE_NW_BACK_0; + break; + case EDGE_SE: + bounds = (rct_xyz16) {32, 32, 0}; + boundsOffset = (rct_xyz16) {1, 0, height + 31}; + 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}; + imageOffset = SPR_STATION_COVER_OFFSET_SE_NW_FRONT; + break; + case EDGE_NW: + bounds = (rct_xyz16) {30, 1, 30}; + boundsOffset = (rct_xyz16) {1, 0, height + 1}; + imageOffset = hasFence ? SPR_STATION_COVER_OFFSET_NE_SW_BACK_1 : SPR_STATION_COVER_OFFSET_NE_SW_BACK_0; + break; + } + + if (RCT2_GLOBAL(0x00F441A0, uint32) != 0x20000000) { + baseImageId &= 0x7FFFF; + } + + if (baseImageId <= 0x20) { + return false; + } + + if (baseImageId & 0x40000000) { + imageId = (baseImageId & 0xBFFFFFFF) + imageOffset; + sub_98197C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation()); + + uint32 edi = RCT2_GLOBAL(0x00F44198, uint32) & (0b11111 << 19); + + // weird jump + imageId = (baseImageId | edi) + 0x3800000 + imageOffset + 12; + sub_98199C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation()); + return true; + } + + imageId = (baseImageId + imageOffset) | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation()); + return true; +} /** * diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index d0a456b621..3d37da77f9 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -17,6 +17,7 @@ #ifndef _TRACK_PAINT_H #define _TRACK_PAINT_H +#include "ride_data.h" #include "../common.h" #include "../world/map.h" #include "../paint/map_element/map_element.h" @@ -39,6 +40,15 @@ enum { SPR_FENCE_ROPE_SE = 22139, SPR_FENCE_ROPE_SW = 22140, SPR_FENCE_ROPE_NW = 22141, + + SPR_STATION_PIER_EDGE_SE = 22404, + SPR_STATION_PIER_EDGE_SW = 22405, + SPR_STATION_PIER_EDGE_NW = 22406, + SPR_STATION_PIER_EDGE_NE = 22407, + SPR_STATION_PIER_EDGE_NW_FENCED = 22408, + SPR_STATION_PIER_EDGE_NE_FENCED = 22409, + SPR_STATION_PIER_FENCE_SE = 22410, + SPR_STATION_PIER_FENCE_SW = 22411, }; extern const uint32 floorSpritesCork[]; @@ -48,6 +58,8 @@ extern const uint32 fenceSpritesRope[]; bool track_paint_util_has_fence(enum edge edge, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint8 rotation); 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); +bool track_paint_util_should_paint_supports(rct_xy16 position); typedef void (*TRACK_PAINT_FUNCTION)(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement); typedef TRACK_PAINT_FUNCTION (*TRACK_PAINT_FUNCTION_GETTER)(int trackType, int direction); @@ -63,5 +75,6 @@ TRACK_PAINT_FUNCTION get_track_paint_function_facility(int trackType, int direct TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_flying_saucers(int trackType, int direction); TRACK_PAINT_FUNCTION get_track_paint_function_crooked_house(int trackType, int direction); +TRACK_PAINT_FUNCTION get_track_paint_function_submarine_ride(int trackType, int direction); #endif diff --git a/src/ride/water/submarine_ride.c b/src/ride/water/submarine_ride.c index 0eb50a4f2f..6f61c671a8 100644 --- a/src/ride/water/submarine_ride.c +++ b/src/ride/water/submarine_ride.c @@ -14,12 +14,13 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" -#include "../../config.h" -#include "../../interface/viewport.h" -#include "../../world/sprite.h" -#include "../../paint/paint.h" +#include "../track_paint.h" +#include "../track.h" #include "../vehicle_paint.h" +#include "../../interface/viewport.h" +#include "../../paint/paint.h" +#include "../../paint/supports.h" +#include "../ride_data.h" /** * @@ -64,3 +65,345 @@ void vehicle_visual_submarine(int x, int imageDirection, int y, int z, rct_vehic assert(vehicleEntry->effect_visual == 1); } + +enum +{ + SPR_SUBMARINE_RIDE_FLAT_NE_SW = 16870, + SPR_SUBMARINE_RIDE_FLAT_SE_NW = 16871, + + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0 = 16872, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1 = 16873, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 = 16874, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0 = 16875, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1 = 16876, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2 = 16877, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0 = 16878, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1 = 16879, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2 = 16880, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0 = 16881, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1 = 16882, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 = 16883, + + SPR_SUBMARINE_RIDE_FLAT_TO_25_DEG_UP_SW_NE, + SPR_SUBMARINE_RIDE_FLAT_TO_25_DEG_UP_NW_SE, + SPR_SUBMARINE_RIDE_FLAT_TO_25_DEG_UP_NE_SW, + SPR_SUBMARINE_RIDE_FLAT_TO_25_DEG_UP_SE_NW, + + SPR_SUBMARINE_RIDE_25_DEG_UP_TO_FLAT_SW_NE, + SPR_SUBMARINE_RIDE_25_DEG_UP_TO_FLAT_NW_SE, + SPR_SUBMARINE_RIDE_25_DEG_UP_TO_FLAT_NE_SW, + SPR_SUBMARINE_RIDE_25_DEG_UP_TO_FLAT_SE_NW, + + SPR_SUBMARINE_RIDE_25_DEG_UP_SW_NE, + SPR_SUBMARINE_RIDE_25_DEG_UP_NW_SE, + SPR_SUBMARINE_RIDE_25_DEG_UP_NE_SW, + SPR_SUBMARINE_RIDE_25_DEG_UP_SE_NW, + + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_SW_NW = 16896, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_NW_NE = 16897, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_NE_SE = 16898, + SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_SE_SW = 16899, +}; + +static void submarine_ride_paint_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]; + int heightLower = height - 16; + uint32 imageId; + bool hasFence; + + if (direction & 1) { + imageId = SPR_SUBMARINE_RIDE_FLAT_SE_NW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); + paint_util_push_tunnel_right(height, TUNNEL_6); + + hasFence = track_paint_util_has_fence(EDGE_NE, position, mapElement, ride, get_current_rotation()); + imageId = (hasFence ? SPR_STATION_PIER_EDGE_NE_FENCED : SPR_STATION_PIER_EDGE_NE) | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98197C(imageId, 0, 0, 6, 32, 1, height, 2, 0, height, get_current_rotation()); + track_paint_util_draw_station_covers(EDGE_NE, hasFence, entranceStyle, direction, height); + + imageId = SPR_STATION_PIER_EDGE_SW | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 24, 0, 8, 32, 1, height, get_current_rotation()); + + hasFence = track_paint_util_has_fence(EDGE_SW, position, mapElement, ride, get_current_rotation()); + if (hasFence) { + imageId = SPR_STATION_PIER_FENCE_SW | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 31, 0, 1, 32, 7, height + 2, get_current_rotation()); + } + track_paint_util_draw_station_covers(EDGE_SW, hasFence, entranceStyle, direction, height); + + } else { + imageId = SPR_SUBMARINE_RIDE_FLAT_NE_SW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); + paint_util_push_tunnel_left(height, TUNNEL_6); + + hasFence = track_paint_util_has_fence(EDGE_NW, position, mapElement, ride, get_current_rotation()); + imageId = (hasFence ? SPR_STATION_PIER_EDGE_NW_FENCED : SPR_STATION_PIER_EDGE_NW) | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98197C(imageId, 0, 0, 32, 6, 1, height, 0, 2, height, get_current_rotation()); + track_paint_util_draw_station_covers(EDGE_NW, hasFence, entranceStyle, direction, height); + + imageId = SPR_STATION_PIER_EDGE_SE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 0, 24, 32, 8, 1, height, get_current_rotation()); + + hasFence = track_paint_util_has_fence(EDGE_SE, position, mapElement, ride, get_current_rotation()); + if (hasFence) { + imageId = SPR_STATION_PIER_FENCE_SE | RCT2_GLOBAL(0x00F4419C, uint32); + sub_98196C(imageId, 0, 31, 32, 1, 7, height + 2, get_current_rotation()); + } + track_paint_util_draw_station_covers(EDGE_SE, hasFence, entranceStyle, direction, height); + } + + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 32, 0x20); +} + +static void submarine_ride_paint_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)}; + int heightLower = height - 16; + uint32 imageId; + + if (direction & 1) { + imageId = SPR_SUBMARINE_RIDE_FLAT_SE_NW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); + paint_util_push_tunnel_right(heightLower, TUNNEL_0); + } else { + imageId = SPR_SUBMARINE_RIDE_FLAT_NE_SW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); + paint_util_push_tunnel_left(heightLower, TUNNEL_0); + } + + if (track_paint_util_should_paint_supports(position)) { + metal_a_supports_paint_setup((direction & 1) ? 4 : 5, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + } + + paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); + paint_util_set_general_support_height(height + 16, 0x20); +} + +static void submarine_ride_paint_track_quarter_turn_3_tiles_nw_sw(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + int heightLower = height - 16; + uint32 imageId; + + switch (trackSequence) { + case 0: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); + + paint_util_push_tunnel_right(heightLower, TUNNEL_0); + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, 0xFFFF, 0); + break; + case 1: + break; + case 2: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 16, 16, 3, heightLower, 16, 0, heightLower, get_current_rotation()); + + paint_util_set_segment_support_height(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, 0xFFFF, 0); + break; + case 3: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); + + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, 0xFFFF, 0); + break; + } + + paint_util_set_general_support_height(height + 16, 0x20); +} + +static void submarine_ride_paint_track_quarter_turn_3_tiles_ne_nw(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + int heightLower = height - 16; + uint32 imageId; + + switch (trackSequence) { + case 0: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); + + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC, 0xFFFF, 0); + break; + case 1: + break; + case 2: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 16, 16, 3, heightLower, 0, 0, heightLower, get_current_rotation()); + + paint_util_set_segment_support_height(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C8, 0xFFFF, 0); + break; + case 3: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); + + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8, 0xFFFF, 0); + break; + } + + paint_util_set_general_support_height(height + 16, 0x20); +} + +static void submarine_ride_paint_track_quarter_turn_3_tiles_se_ne(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + int heightLower = height - 16; + uint32 imageId; + + switch (trackSequence) { + case 0: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); + + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_CC | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_C0, 0xFFFF, 0); + break; + case 1: + break; + case 2: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 16, 16, 3, heightLower, 0, 16, heightLower, get_current_rotation()); + + paint_util_set_segment_support_height(SEGMENT_CC | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC, 0xFFFF, 0); + break; + case 3: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); + + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC, 0xFFFF, 0); + paint_util_push_tunnel_left(heightLower, TUNNEL_0); + break; + } + + paint_util_set_general_support_height(height + 16, 0x20); +} + +static void submarine_ride_paint_track_quarter_turn_3_tiles_sw_se(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + int heightLower = height - 16; + uint32 imageId; + + switch (trackSequence) { + case 0: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 20, 32, 3, heightLower, 6, 0, heightLower, get_current_rotation()); + + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_D4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_B8, 0xFFFF, 0); + paint_util_push_tunnel_right(heightLower, TUNNEL_0); + break; + case 1: + break; + case 2: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 16, 16, 3, heightLower, 16, 16, heightLower, get_current_rotation()); + + paint_util_set_segment_support_height(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, 0xFFFF, 0); + break; + case 3: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0 | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 32, 20, 3, heightLower, 0, 6, heightLower, get_current_rotation()); + + metal_a_supports_paint_setup(4, 4, -1, heightLower, RCT2_GLOBAL(0x00F4419C, uint32)); + paint_util_set_segment_support_height(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_B4, 0xFFFF, 0); + break; + } + + paint_util_set_general_support_height(height + 16, 0x20); +} + +static void submarine_ride_paint_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + switch (direction) { + case 0: + submarine_ride_paint_track_quarter_turn_3_tiles_nw_sw(rideIndex, trackSequence, direction, height, mapElement); + break; + case 1: + submarine_ride_paint_track_quarter_turn_3_tiles_ne_nw(rideIndex, trackSequence, direction, height, mapElement); + break; + case 2: + submarine_ride_paint_track_quarter_turn_3_tiles_se_ne(rideIndex, trackSequence, direction, height, mapElement); + break; + case 3: + submarine_ride_paint_track_quarter_turn_3_tiles_sw_se(rideIndex, trackSequence, direction, height, mapElement); + break; + } +} + +uint8 right_quarter_turn_3_tiles_to_left_turn_map[] = {3, 1, 2, 0}; +static void submarine_ride_paint_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]; + return submarine_ride_paint_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); +} + +static void submarine_ride_paint_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + int heightLower = height - 16; + uint32 imageId; + + switch (direction) { + case 0: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_SW_NW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 26, 24, 1, heightLower, 6, 2, heightLower, get_current_rotation()); + paint_util_push_tunnel_left(heightLower, TUNNEL_0); + break; + case 1: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_NW_NE | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 26, 26, 1, heightLower, 0, 0, heightLower, get_current_rotation()); + break; + case 2: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_NE_SE | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 24, 26, 1, heightLower, 2, 6, heightLower, get_current_rotation()); + paint_util_push_tunnel_right(heightLower, TUNNEL_0); + break; + case 3: + imageId = SPR_SUBMARINE_RIDE_FLAT_QUARTER_TURN_1_TILE_SE_SW | RCT2_GLOBAL(0x00F44198, uint32); + sub_98197C(imageId, 0, 0, 24, 24, 1, heightLower, 6, 6, heightLower, get_current_rotation()); + paint_util_push_tunnel_right(heightLower, TUNNEL_0); + paint_util_push_tunnel_left(heightLower, TUNNEL_0); + break; + } + + paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0, direction), 0xFFFF, 0); + paint_util_set_general_support_height(height + 16, 0x20); +} + +static void submarine_ride_paint_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +{ + submarine_ride_paint_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); +} + +/** + * rct2: 0x008995D4 + */ +TRACK_PAINT_FUNCTION get_track_paint_function_submarine_ride(int trackType, int direction) +{ + switch (trackType) { + case TRACK_ELEM_BEGIN_STATION: + case TRACK_ELEM_MIDDLE_STATION: + case TRACK_ELEM_END_STATION: + return submarine_ride_paint_track_station; + + case TRACK_ELEM_FLAT: + return submarine_ride_paint_track_flat; + + case TRACK_ELEM_LEFT_QUARTER_TURN_3_TILES: + return submarine_ride_paint_track_left_quarter_turn_3_tiles; + case TRACK_ELEM_RIGHT_QUARTER_TURN_3_TILES: + return submarine_ride_paint_track_right_quarter_turn_3_tiles; + + case TRACK_ELEM_LEFT_QUARTER_TURN_1_TILE: + return submarine_ride_paint_track_left_quarter_turn_1_tile; + case TRACK_ELEM_RIGHT_QUARTER_TURN_1_TILE: + return submarine_ride_paint_track_right_quarter_turn_1_tile; + } + + return NULL; +} diff --git a/src/windows/ride.c b/src/windows/ride.c index 719d3078e5..8ab5fead92 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -4316,7 +4316,7 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) const rct_ride_entrance_definition *entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; terniaryColour = 0; - if (entranceStyle->flags & 0x40000000) { + if (entranceStyle->base_image_id & 0x40000000) { terniaryColour = 0x40000000 | ((trackColour.main + 112) << 19); }