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

Fix Viriginia Reel

This commit is contained in:
Marijn van der Werf 2016-09-15 19:34:33 +02:00
parent f0dd452fa3
commit 4dea417470
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ride/coaster/virginia_reel.c
View File

@ -241,10 +241,10 @@ static void paint_virginia_reel_track_flat(uint8 rideIndex, uint8 trackSequence,
uint32 imageId = sprites[direction] | gTrackColours[SCHEME_TRACK];
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);
paint_util_push_tunnel_right(height, TUNNEL_6);
} else {
sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation());
paint_util_push_tunnel_left(height, TUNNEL_0);
paint_util_push_tunnel_left(height, TUNNEL_6);
}
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL);
@ -336,8 +336,6 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t
break;
}
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS], NULL);
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(height + 48, 0x20);
}
@ -414,7 +412,7 @@ static void paint_virginia_reel_station(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C(imageId, 0, 0, 32, 28, 2, height - 2, 0, 2, height, get_current_rotation());
imageId = SPR_VIRGINIA_REEL_FLAT_SW_NE | gTrackColours[SCHEME_TRACK];
sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation());
sub_98199C(imageId, 0, 0, 32, 20, 2, height, 0, 0, height, get_current_rotation());
paint_util_push_tunnel_left(height, TUNNEL_6);
} else if (direction == 1 || direction == 3) {
@ -422,7 +420,7 @@ static void paint_virginia_reel_station(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C(imageId, 0, 0, 28, 32, 2, height - 2, 2, 0, height, get_current_rotation());
imageId = SPR_VIRGINIA_REEL_FLAT_NW_SE | gTrackColours[SCHEME_TRACK];
sub_98199C(imageId, 0, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation());
sub_98199C(imageId, 0, 0, 20, 32, 2, height, 0, 0, height, get_current_rotation());
paint_util_push_tunnel_right(height, TUNNEL_6);
}
@ -440,7 +438,7 @@ static const uint8 virginia_reel_left_quarter_turn_supports[] = {5, 2, 3, 4};
static void paint_virginia_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, gTrackColours[SCHEME_TRACK], 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);
track_paint_util_left_quarter_turn_3_tiles_tunnel(height, TUNNEL_6, direction, trackSequence);
switch (trackSequence) {
case 2:

2
src/ride/gentle/mini_helicopters.c
View File

@ -214,7 +214,7 @@ static void paint_mini_helicopters_track_25_deg_down_to_flat(uint8 rideIndex, ui
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(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation());
track_paint_util_left_quarter_turn_3_tiles_tunnel(height, direction, trackSequence);
track_paint_util_left_quarter_turn_3_tiles_tunnel(height, TUNNEL_0, direction, trackSequence);
switch (trackSequence) {
case 0:

2
src/ride/gentle/monorail_cycles.c
View File

@ -239,7 +239,7 @@ static void paint_monorail_cycles_station(uint8 rideIndex, uint8 trackSequence,
static void paint_monorail_cycles_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(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], monorail_cycles_track_pieces_flat_quarter_turn_3_tiles, get_current_rotation());
track_paint_util_left_quarter_turn_3_tiles_tunnel(height, direction, trackSequence);
track_paint_util_left_quarter_turn_3_tiles_tunnel(height, TUNNEL_0, direction, trackSequence);
switch (trackSequence) {
case 0:

10
src/ride/track_paint.c
View File

@ -1185,24 +1185,24 @@ void track_paint_util_left_quarter_turn_3_tiles_paint(sint8 thickness, sint16 he
}
}
void track_paint_util_left_quarter_turn_3_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence)
void track_paint_util_left_quarter_turn_3_tiles_tunnel(sint16 height, uint8 tunnelType, uint8 direction, uint8 trackSequence)
{
if (direction == 0 && trackSequence == 0) {
paint_util_push_tunnel_left(height, TUNNEL_0);
paint_util_push_tunnel_left(height, tunnelType);
}
if (direction == 2 && trackSequence == 3) {
paint_util_push_tunnel_right(height, TUNNEL_0);
paint_util_push_tunnel_right(height, tunnelType);
}
if (direction == 3 && trackSequence == 0) {
paint_util_push_tunnel_right(height, TUNNEL_0);
paint_util_push_tunnel_right(height, tunnelType);
}
if (direction == 3 && trackSequence == 3) {
paint_util_push_tunnel_left(height, TUNNEL_0);
paint_util_push_tunnel_left(height, tunnelType);
}
}

2
src/ride/track_paint.h
View File

@ -233,7 +233,7 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, int dire
void track_paint_util_right_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], const rct_xy16 offsets[4][3], const rct_xy16 boundsLengths[4][3], const rct_xyz16 boundsOffsets[4][3], uint8 rotation);
void track_paint_util_right_quarter_turn_3_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType);
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_3_tiles_tunnel(sint16 height, uint8 tunnelType, 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);
void track_paint_util_spinning_tunnel_paint(sint8 thickness, sint16 height, uint8 direction, uint8 rotation);

2
src/ride/water/submarine_ride.c
View File

@ -120,7 +120,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(3, height - 16, direction, trackSequence, gTrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation());
track_paint_util_left_quarter_turn_3_tiles_tunnel(height - 16, direction, trackSequence);
track_paint_util_left_quarter_turn_3_tiles_tunnel(height - 16, TUNNEL_0, direction, trackSequence);
switch (trackSequence) {
case 0: