From 2a4c0ebe20cd4cb7e45079949b6574b2dadc3424 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 22 Jul 2017 22:07:27 +0200 Subject: [PATCH] Allow on-ride photo segments on Bobsleighs --- src/openrct2/ride/coaster/bobsleigh_coaster.c | 44 +++++++++++++++++++ src/openrct2/ride/track_data.c | 2 +- src/openrct2/sprites.h | 3 ++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/openrct2/ride/coaster/bobsleigh_coaster.c b/src/openrct2/ride/coaster/bobsleigh_coaster.c index 32a5c8e76f..712190cd49 100644 --- a/src/openrct2/ride/coaster/bobsleigh_coaster.c +++ b/src/openrct2/ride/coaster/bobsleigh_coaster.c @@ -2245,6 +2245,47 @@ static void bobsleigh_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } +static void bobsleigh_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) +{ + switch (direction) + { + case 0: + sub_98196C_rotated(direction, IMAGE_TYPE_REMAP | SPR_METAL_PLATE, 0, 0, 32, 32, 1, height); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14572, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14574, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + break; + case 1: + sub_98196C_rotated(direction, IMAGE_TYPE_REMAP | SPR_METAL_PLATE, 0, 0, 32, 32, 1, height); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14573, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14575, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + break; + case 2: + sub_98196C_rotated(direction, IMAGE_TYPE_REMAP | SPR_METAL_PLATE, 0, 0, 32, 32, 1, height); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14572, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14574, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + + break; + case 3: + sub_98196C_rotated(direction, IMAGE_TYPE_REMAP | SPR_METAL_PLATE, 0, 0, 32, 32, 1, height); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); + metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14573, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14575, 0, 0, 32, 20, 0, height, 0, 6, height + 3); + + break; + } + track_paint_util_onride_photo_paint(direction, height + 3, mapElement); + paint_util_push_tunnel_rotated(direction, height, TUNNEL_6); + paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); + paint_util_set_general_support_height(height + 48, 0x20); +} + TRACK_PAINT_FUNCTION get_track_paint_function_bobsleigh_rc(sint32 trackType, sint32 direction) { switch (trackType) { @@ -2334,6 +2375,9 @@ TRACK_PAINT_FUNCTION get_track_paint_function_bobsleigh_rc(sint32 trackType, sin return bobsleigh_rc_track_brakes; case TRACK_ELEM_BLOCK_BRAKES: return bobsleigh_rc_track_block_brakes; + + case TRACK_ELEM_ON_RIDE_PHOTO: + return bobsleigh_rc_track_on_ride_photo; } return NULL; } diff --git a/src/openrct2/ride/track_data.c b/src/openrct2/ride/track_data.c index 8d910edcf2..4a6ad9455d 100644 --- a/src/openrct2/ride/track_data.c +++ b/src/openrct2/ride/track_data.c @@ -1068,7 +1068,7 @@ const uint64 RideTypePossibleTrackConfigurations[RIDE_TYPE_COUNT] = { /* RIDE_TYPE_STEEPLECHASE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES), /* RIDE_TYPE_CAR_RIDE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_SPINNING_TUNNEL) | (1ULL << TRACK_RAPIDS), /* RIDE_TYPE_LAUNCHED_FREEFALL */ (1ULL << TRACK_TOWER_BASE), - /* RIDE_TYPE_BOBSLEIGH_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES), + /* RIDE_TYPE_BOBSLEIGH_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO), /* RIDE_TYPE_OBSERVATION_TOWER */ (1ULL << TRACK_TOWER_BASE), /* RIDE_TYPE_LOOPING_ROLLER_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_BOOSTER), /* RIDE_TYPE_DINGHY_SLIDE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE), diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index fbbba24c54..718beaf472 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -671,6 +671,9 @@ enum { SPR_RIDE_DESIGN_PREVIEW_MAZE_ICE_BLOCKS = 21992, SPR_RIDE_DESIGN_PREVIEW_MAZE_WOODEN_FENCES = 21993, + // Used by on-ride photo segment and station + SPR_METAL_PLATE = 22432, + SPR_LAND_OWNERSHIP_AVAILABLE = 22955, SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE = 22956,