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

Apply review comments

This commit is contained in:
duncanspumpkin 2022-03-12 07:26:34 +00:00
parent 68d0d05d49
commit 7a36e34782
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/ride/gentle/SpiralSlide.cpp
View File

@ -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);
}
}
}

16
src/openrct2/ride/transport/MiniatureRailway.cpp
View File

@ -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)