mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Ted John
2016-10-05 18:39:25 +01:00
parent 8abd11f8bd
commit c6efe8dabc
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ride/coaster/wild_mouse.c
View File

@@ -493,18 +493,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, u
sbb->bb_size.x, sbb->bb_size.y, (sint8)sbb->bb_size.z, height + (sint8)sbb->offset.z, get_current_rotation());
}
if (direction == 0 && trackSequence == 0) {
paint_util_push_tunnel_left(height + 8, TUNNEL_2);
}
if (direction == 0 && trackSequence == 3) {
paint_util_push_tunnel_right(height - 8, TUNNEL_1);
}
if (direction == 1 && trackSequence == 3) {
paint_util_push_tunnel_left(height - 8, TUNNEL_1);
}
if (direction == 3 && trackSequence == 0) {
paint_util_push_tunnel_right(height + 8, TUNNEL_2);
}
track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(height, direction, trackSequence, TUNNEL_2, TUNNEL_1);
switch (trackSequence) {
case 0:
@@ -558,18 +547,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uin
sbb->bb_size.x, sbb->bb_size.y, (sint8)sbb->bb_size.z, height + (sint8)sbb->offset.z, get_current_rotation());
}
if (direction == 0 && trackSequence == 0) {
paint_util_push_tunnel_left(height - 8, TUNNEL_1);
}
if (direction == 0 && trackSequence == 3) {
paint_util_push_tunnel_right(height + 8, TUNNEL_2);
}
if (direction == 1 && trackSequence == 3) {
paint_util_push_tunnel_left(height + 8, TUNNEL_2);
}
if (direction == 3 && trackSequence == 0) {
paint_util_push_tunnel_right(height - 8, TUNNEL_1);
}
track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(height, direction, trackSequence, TUNNEL_1, TUNNEL_2);
switch (trackSequence) {
case 0:

31
src/ride/track_paint.c
View File

@@ -1270,6 +1270,37 @@ void track_paint_util_right_quarter_turn_3_tiles_tunnel(sint16 height, uint8 dir
}
}
void track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3)
{
if (direction == 0 && trackSequence == 0) {
paint_util_push_tunnel_left(height - 8, tunnelType0);
}
if (direction == 0 && trackSequence == 3) {
paint_util_push_tunnel_right(height + 8, tunnelType3);
}
if (direction == 1 && trackSequence == 3) {
paint_util_push_tunnel_left(height + 8, tunnelType3);
}
if (direction == 3 && trackSequence == 0) {
paint_util_push_tunnel_right(height - 8, tunnelType0);
}
}
void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3)
{
if (direction == 0 && trackSequence == 0) {
paint_util_push_tunnel_left(height + 8, tunnelType0);
}
if (direction == 0 && trackSequence == 3) {
paint_util_push_tunnel_right(height - 8, tunnelType3);
}
if (direction == 1 && trackSequence == 3) {
paint_util_push_tunnel_left(height - 8, tunnelType3);
}
if (direction == 3 && trackSequence == 0) {
paint_util_push_tunnel_right(height + 8, tunnelType0);
}
}
static const sint8 left_quarter_turn_3_tiles_sprite_map[] = {2, -1, 1, 0};
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)

2
src/ride/track_paint.h
View File

@@ -235,6 +235,8 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, int dire
void track_paint_util_right_quarter_turn_5_tiles_paint_3(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]);
void track_paint_util_right_quarter_turn_5_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType);
void track_paint_util_right_quarter_turn_5_tiles_wooden_supports(sint16 height, uint8 direction, uint8 trackSequence);
void track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3);
void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3);
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_paint_2(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation);
void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset);