From 7a36e347820ccefd2daab759d321f4818e1fe49c Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sat, 12 Mar 2022 07:26:34 +0000
Subject: [PATCH] Apply review comments

---
 src/openrct2/ride/gentle/SpiralSlide.cpp         |  4 +---
 src/openrct2/ride/transport/MiniatureRailway.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp
index 29eea84fdc..672909dbbc 100644
--- a/src/openrct2/ride/gentle/SpiralSlide.cpp
+++ b/src/openrct2/ride/gentle/SpiralSlide.cpp
@@ -172,9 +172,7 @@ static void spiral_slide_paint_tile_front(
 
             image_id = (offset + slide_progress) | (ride.slide_peep_t_shirt_colour << 19) | (1 << 29);
 
-            PaintAddImageAsChild(
-                session, image_id, { 16, 16, height }, { boundingBox.x, boundingBox.y, boundingBox.z },
-                { boundingBoxOffset.x, boundingBoxOffset.y, boundingBoxOffset.z });
+            PaintAddImageAsChild(session, image_id, { 16, 16, height }, boundingBox, boundingBoxOffset);
         }
     }
 }
diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp
index b348551dc8..199b2d306e 100644
--- a/src/openrct2/ride/transport/MiniatureRailway.cpp
+++ b/src/openrct2/ride/transport/MiniatureRailway.cpp
@@ -1133,8 +1133,8 @@ static void paint_miniature_railway_track_s_bend_left(
     if (!isSupported)
     {
         PaintAddImageAsParentRotated(
-            session, direction, imageId, { static_cast<int8_t>(offset.x), static_cast<int8_t>(offset.y), height },
-            { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
+            session, direction, imageId, { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 },
+            { offset.x, offset.y, height });
     }
     else
     {
@@ -1145,8 +1145,8 @@ static void paint_miniature_railway_track_s_bend_left(
 
         imageId = miniature_railway_track_pieces_s_bend_left[direction & 1][trackSequence] | session.TrackColours[SCHEME_TRACK];
         PaintAddImageAsChildRotated(
-            session, direction, imageId, { static_cast<int8_t>(offset.x), static_cast<int8_t>(offset.y), height },
-            { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
+            session, direction, imageId, { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 },
+            { offset.x, offset.y, height });
     }
     if (direction == 0 || direction == 2)
     {
@@ -1240,8 +1240,8 @@ static void paint_miniature_railway_track_s_bend_right(
     if (!isSupported)
     {
         PaintAddImageAsParentRotated(
-            session, direction, imageId, { static_cast<int8_t>(offset.x), static_cast<int8_t>(offset.y), height },
-            { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
+            session, direction, imageId, { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 },
+            { offset.x, offset.y, height });
     }
     else
     {
@@ -1253,8 +1253,8 @@ static void paint_miniature_railway_track_s_bend_right(
         imageId = miniature_railway_track_pieces_s_bend_right[direction & 1][trackSequence]
             | session.TrackColours[SCHEME_TRACK];
         PaintAddImageAsChildRotated(
-            session, direction, imageId, { static_cast<int8_t>(offset.x), static_cast<int8_t>(offset.y), height },
-            { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
+            session, direction, imageId, { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 },
+            { offset.x, offset.y, height });
     }
 
     if (direction == 0 || direction == 2)