mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement up tracks

This commit is contained in:
Ted John 2016-09-25 15:16:24 +01:00
parent aaa4fd0e7d
commit d960f79c37
1 changed files with 111 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/ride/water/log_flume.c
View File

@ -30,7 +30,6 @@ enum {
SPR_LOG_FLUME_FLAT_FRONT_NW_SE = 21001,
SPR_LOG_FLUME_FLAT_FRONT_NE_SW = 21002,
SPR_LOG_FLUME_FLAT_FRONT_SE_NW = 21003,
SPR_LOG_FLUME_REVERSER_SW_NE = 21004,
SPR_LOG_FLUME_REVERSER_NW_SE = 21005,
SPR_LOG_FLUME_REVERSER_NE_SW = 21006,
@ -39,6 +38,30 @@ enum {
SPR_LOG_FLUME_REVERSER_FRONT_NW_SE = 21009,
SPR_LOG_FLUME_REVERSER_FRONT_NE_SW = 21010,
SPR_LOG_FLUME_REVERSER_FRONT_SE_NW = 21011,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_SW_NE = 21012,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_NW_SE = 21013,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_NE_SW = 21014,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_SE_NW = 21015,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_SW_NE = 21016,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_NW_SE = 21017,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_NE_SW = 21018,
SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_SE_NW = 21019,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_SW_NE = 21020,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_NW_SE = 21021,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_NE_SW = 21022,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_SE_NW = 21023,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_SW_NE = 21024,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_NW_SE = 21025,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_NE_SW = 21026,
SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_SE_NW = 21027,
SPR_LOG_FLUME_25_DEG_UP_SW_NE = 21028,
SPR_LOG_FLUME_25_DEG_UP_NW_SE = 21029,
SPR_LOG_FLUME_25_DEG_UP_NE_SW = 21030,
SPR_LOG_FLUME_25_DEG_UP_SE_NW = 21031,
SPR_LOG_FLUME_25_DEG_UP_FRONT_SW_NE = 21032,
SPR_LOG_FLUME_25_DEG_UP_FRONT_NW_SE = 21033,
SPR_LOG_FLUME_25_DEG_UP_FRONT_NE_SW = 21034,
SPR_LOG_FLUME_25_DEG_UP_FRONT_SE_NW = 21035,
};
static const uint32 LogFlumeTrackFlatImageIds[4][2] =
@ -94,6 +117,87 @@ static void paint_log_flume_track_station(uint8 rideIndex, uint8 trackSequence,
paint_util_set_general_support_height(height + 32, 0x20);
}
static void paint_log_flume_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
static const uint32 imageIds[4][2] =
{
{ SPR_LOG_FLUME_25_DEG_UP_SW_NE, SPR_LOG_FLUME_25_DEG_UP_FRONT_SW_NE },
{ SPR_LOG_FLUME_25_DEG_UP_NW_SE, SPR_LOG_FLUME_25_DEG_UP_FRONT_NW_SE },
{ SPR_LOG_FLUME_25_DEG_UP_NE_SW, SPR_LOG_FLUME_25_DEG_UP_FRONT_NE_SW },
{ SPR_LOG_FLUME_25_DEG_UP_SE_NW, SPR_LOG_FLUME_25_DEG_UP_FRONT_SE_NW },
};
uint32 imageId = imageIds[direction][0] | gTrackColours[SCHEME_TRACK];
uint32 frontImageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1);
} else {
paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_2);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 56, 0x20);
}
static void paint_log_flume_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
static const uint32 imageIds[4][2] =
{
{ SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_SW_NE, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_SW_NE },
{ SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_NW_SE, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_NW_SE },
{ SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_NE_SW, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_NE_SW },
{ SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_SE_NW, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_SE_NW },
};
uint32 imageId = imageIds[direction][0] | gTrackColours[SCHEME_TRACK];
uint32 frontImageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
metal_a_supports_paint_setup(3, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} else {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_2);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 48, 0x20);
}
static void paint_log_flume_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
static const uint32 imageIds[4][2] =
{
{ SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_SW_NE, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_SW_NE },
{ SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_NW_SE, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_NW_SE },
{ SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_NE_SW, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_NE_SW },
{ SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_SE_NW, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_SE_NW },
};
uint32 imageId = imageIds[direction][0] | gTrackColours[SCHEME_TRACK];
uint32 frontImageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
metal_a_supports_paint_setup(3, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0);
} else {
paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_12);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 40, 0x20);
}
static void paint_log_flume_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
uint32 imageId = SPR_STATION_BASE_D | 0x20000000;
@ -153,6 +257,12 @@ TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(int trackType, int direc
case TRACK_ELEM_BEGIN_STATION:
case TRACK_ELEM_MIDDLE_STATION:
return paint_log_flume_track_station;
case TRACK_ELEM_25_DEG_UP:
return paint_log_flume_track_25_deg_up;
case TRACK_ELEM_FLAT_TO_25_DEG_UP:
return paint_log_flume_track_flat_to_25_deg_up;
case TRACK_ELEM_25_DEG_UP_TO_FLAT:
return paint_log_flume_track_25_deg_up_to_flat;
case TRACK_ELEM_ON_RIDE_PHOTO:
return paint_log_flume_track_on_ride_photo;