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

Fix remaining Junior RC testpaint fails

This commit is contained in:
Ted John 2016-10-01 17:06:12 +01:00
parent b977304996
commit ee896a481e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/paint/paint_helpers.c
View File

@ -26,7 +26,7 @@ paint_struct * sub_98196C_rotated(
sint16 z_offset)
{
if (direction & 1) {
return sub_98196C(image_id, x_offset, y_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset, get_current_rotation());
return sub_98196C(image_id, y_offset, x_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset, get_current_rotation());
} else {
return sub_98196C(image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, get_current_rotation());
}

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

@ -1808,13 +1808,11 @@ static void junior_rc_flat_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 track
image_id |= junior_rc_track_pieces_flat_to_25_deg_up[isChained][direction];
if (direction & 1) {
sub_98196C(image_id, 6, 0, 20, 32, 1, height, get_current_rotation());
paint_util_push_tunnel_right(height, TUNNEL_0);
}
else {
sub_98196C(image_id, 0, 6, 32, 20, 1, height, get_current_rotation());
paint_util_push_tunnel_left(height, TUNNEL_0);
sub_98196C_rotated(direction, image_id, 0, 6, 32, 20, 1, height);
if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} else {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_2);
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};