From b7aa5ebd2e2254647bbaeeec0ecda1813cac8771 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Fri, 11 Mar 2022 13:55:01 +0000 Subject: [PATCH] Correct failures --- src/openrct2/ride/coaster/MineTrainCoaster.cpp | 11 +++++------ src/openrct2/ride/coaster/WildMouse.cpp | 11 +++++------ src/openrct2/ride/transport/MiniatureRailway.cpp | 8 ++++---- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 70918b9d2d..54747d527b 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -103,12 +103,11 @@ static void mine_train_rc_track_station( }; PaintAddImageAsParentRotated( - session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2}, { 32, 28, 1}, { 0, 2, - height); - if (trackElement.GetTrackType() == TrackElemType::EndStation) - { - bool isClosed = trackElement.BlockBrakeClosed( - }); + session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2 }, { 32, 28, 1 }, + { 0, 2, height }); + if (trackElement.GetTrackType() == TrackElemType::EndStation) + { + bool isClosed = trackElement.BlockBrakeClosed(); PaintAddImageAsChildRotated( session, direction, _MineTrainBlockBrakeImages[direction][isClosed] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 0, height); diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 6084940b9a..9956421abd 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -201,12 +201,11 @@ static void wild_mouse_track_station( int32_t trackType = trackElement.GetTrackType(); PaintAddImageAsParentRotated( - session, direction, baseImageIds[direction] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2}, { 32, 28, 2}, { 0, 2, - height); - if (trackType == TrackElemType::EndStation) - { - bool isClosed = trackElement.BlockBrakeClosed( - }); + session, direction, baseImageIds[direction] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2 }, { 32, 28, 2 }, + { 0, 2, height }); + if (trackType == TrackElemType::EndStation) + { + bool isClosed = trackElement.BlockBrakeClosed(); PaintAddImageAsChildRotated( session, direction, _wild_mouse_block_brakes_image_ids[direction][isClosed] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 2, height, 0, 0, height); diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 652f1597ac..dadc16ee87 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -674,16 +674,16 @@ static void paint_miniature_railway_track_flat( imageId = miniature_railway_track_pieces_flat[direction] | session.TrackColours[SCHEME_TRACK]; if (!paintAsGravel) { - PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height}, { 32, 20, 2}, { 0, 6, height); + PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height }); } else { - imageIdAlt = miniature_railway_track_to_gravel(imageId}); - PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height}, { 32, 20, 2}, { 0, 6, height); + imageIdAlt = miniature_railway_track_to_gravel(imageId); + PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height }); } if (paintGrooved) { - imageIdAlt = miniature_railway_track_to_grooved(imageId}); + imageIdAlt = miniature_railway_track_to_grooved(imageId); PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height + 2 }); imageIdAlt = miniature_railway_track_to_grooved_indent( imageId, session.PathElementOnSameHeight, direction, session.CurrentRotation);