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

Implement vertical up, down and top

This commit is contained in:
Ted John 2016-10-02 19:10:27 +01:00
parent ab7d38bc36
commit 62296c6558
1 changed files with 159 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
src/ride/coaster/air_powered_vertical_coaster.c
View File

@ -34,6 +34,15 @@ enum {
SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE = 22230,
SPR_AIR_POWERED_VERTICAL_RC_BRAKES_SW_NE = 22231,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_0 = 22236,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_0 = 22237,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_0 = 22238,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SE_NW_SEQ_0 = 22239,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_1 = 22232,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_1 = 22233,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_1 = 22234,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SE_NW_SEQ_1 = 22235,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_SW_NE = 22334,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_NW_SE = 22335,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_NE_SW = 22336,
@ -50,6 +59,18 @@ enum {
SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_NW_SE = 22347,
SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_NE_SW = 22348,
SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_SE_NW = 22349,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_1 = 22350,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_0 = 22351,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_3 = 22352,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_2 = 22353,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_1 = 22354,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_0 = 22355,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_3 = 22356,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_2 = 22357,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SW_NE = 22358,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NW_SE = 22359,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NE_SW = 22360,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SE_NW = 22361,
};
static void air_powered_vertical_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
@ -204,6 +225,137 @@ static void air_powered_vertical_rc_track_brakes(uint8 rideIndex, uint8 trackSeq
paint_util_set_general_support_height(height + 32, 0x20);
}
static void air_powered_vertical_rc_track_vertical_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
static const uint32 imageIds[4][2] = {
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_1 },
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_1 },
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_1 },
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SE_NW_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SE_NW_SEQ_1 },
};
switch (trackSequence) {
case 0:
{
uint32 colourFlags = gTrackColours[SCHEME_SUPPORTS];
uint32 trackColour = gTrackColours[SCHEME_TRACK];
if (trackColour & 0x80000000) {
colourFlags |= (trackColour & 0x9F000000);
}
uint32 imageId = imageIds[direction][0] | colourFlags;
sub_98197C_rotated(direction, imageId, 0, 0, 26, 26, 79, height, 3, 3, height);
break;
}
case 1:
{
uint32 imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3) {
sub_98197C_rotated(direction, imageId, 0, 0, 2, 20, 79, height, 0, 6, height);
} else {
sub_98197C_rotated(direction, imageId, 0, 0, 2, 20, 79, height, 30, 6, height);
}
paint_util_set_vertical_tunnel(height + 80);
break;
}
}
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(height + 80, 0x20);
}
static void air_powered_vertical_rc_track_vertical_top(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
if (direction == 2 || direction == 3) {
air_powered_vertical_rc_track_vertical_top(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement);
return;
}
static const uint32 imageIds[4][6] = {
{
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SW_NE,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_0,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_1,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_2,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NE_SW,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_3
},
{
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NW_SE,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_0,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_1,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_2,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SE_NW,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_3
},
};
uint32 colourFlags, trackColour, imageIdS, imageIdT;
switch (trackSequence) {
case 0:
colourFlags = gTrackColours[SCHEME_SUPPORTS];
trackColour = gTrackColours[SCHEME_TRACK];
if (trackColour & 0x80000000) {
colourFlags |= (trackColour & 0x9F000000);
}
imageIdS = imageIds[direction][0] | colourFlags;
imageIdT = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
if (direction == 0) {
sub_98197C_rotated(direction, imageIdS, 0, 0, 32, 20, 15, height, 0, 6, height);
sub_98199C_rotated(direction, imageIdT, 0, 0, 31, 20, 15, height, 1, 6, height);
} else {
sub_98197C_rotated(direction, imageIdS, 0, 0, 5, 20, 1, height, 24, 6, height);
sub_98199C_rotated(direction, imageIdT, 0, 0, 5, 20, 1, height, 24, 6, height);
}
break;
case 1:
imageIdT = imageIds[direction][2] | gTrackColours[SCHEME_TRACK];
if (direction == 0) {
sub_98197C_rotated(direction, imageIdT, 0, 0, 2, 20, 15, height, 0, 6, height);
} else {
sub_98197C_rotated(direction, imageIdT, 0, 0, 2, 20, 1, height, 33, 6, height);
}
paint_util_set_vertical_tunnel(height + 80);
break;
case 2:
imageIdT = imageIds[direction][3] | gTrackColours[SCHEME_TRACK];
if (direction == 0) {
sub_98197C_rotated(direction, imageIdT, 0, 0, 2, 20, 1, height, 33, 6, height);
} else {
sub_98197C_rotated(direction, imageIdT, 0, 0, 2, 20, 15, height, 0, 6, height);
}
paint_util_set_vertical_tunnel(height + 80);
break;
case 3:
colourFlags = gTrackColours[SCHEME_SUPPORTS];
trackColour = gTrackColours[SCHEME_TRACK];
if (trackColour & 0x80000000) {
colourFlags |= (trackColour & 0x9F000000);
}
imageIdS = imageIds[direction][4] | colourFlags;
imageIdT = imageIds[direction][5] | gTrackColours[SCHEME_TRACK];
if (direction == 0) {
sub_98197C_rotated(direction, imageIdS, 0, 0, 5, 20, 1, height, 24, 6, height);
sub_98199C_rotated(direction, imageIdT, 0, 0, 5, 20, 1, height, 24, 6, height);
} else {
sub_98197C_rotated(direction, imageIdS, 0, 0, 32, 20, 15, height, 0, 6, height);
sub_98199C_rotated(direction, imageIdT, 0, 0, 32, 20, 15, height, 0, 6, height);
}
break;
}
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(height + 80, 0x20);
}
static void air_powered_vertical_rc_track_vertical_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
air_powered_vertical_rc_track_vertical_up(rideIndex, trackSequence ^ 1, (direction + 2) & 3, height, mapElement);
}
TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(int trackType, int direction)
{
switch (trackType) {
@ -229,6 +381,13 @@ TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(int trackT
case TRACK_ELEM_BRAKES:
return air_powered_vertical_rc_track_brakes;
case TRACK_ELEM_REVERSE_WHOA_BELLY_VERTICAL:
return air_powered_vertical_rc_track_vertical_up;
case TRACK_ELEM_AIR_THRUST_TOP_CAP:
return air_powered_vertical_rc_track_vertical_top;
case TRACK_ELEM_AIR_THRUST_VERTICAL_DOWN:
return air_powered_vertical_rc_track_vertical_down;
}
return NULL;
}