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

Apply regex to PaintAddImageAsChildRotated

This commit is contained in:
duncanspumpkin 2022-03-11 14:56:34 +00:00
parent 1c781a84c8
commit 39c8fda4e6
23 changed files with 2195 additions and 1725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/paint/Paint.h
View File

@ -319,10 +319,6 @@ paint_struct* PaintAddImageAsChild(
paint_session& session, ImageId image_id, const CoordsXYZ& offset, const CoordsXYZ& boundBoxLength,
const CoordsXYZ& boundBoxOffset);
paint_struct* PaintAddImageAsChildRotated(
paint_session& session, uint8_t direction, uint32_t image_id, int32_t x_offset, int32_t y_offset,
int32_t bound_box_length_x, int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset,
int32_t bound_box_offset_x, int32_t bound_box_offset_y, int32_t bound_box_offset_z);
paint_struct* PaintAddImageAsChildRotated(
paint_session& session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset);

17
src/openrct2/paint/PaintHelpers.cpp
View File

@ -38,23 +38,6 @@ paint_struct* PaintAddImageAsParentRotated(
return PaintAddImageAsParent(session, image_id, offset, boundBoxSize);
}
paint_struct* PaintAddImageAsChildRotated(
paint_session& session, uint8_t direction, uint32_t image_id, int32_t x_offset, int32_t y_offset,
int32_t bound_box_length_x, int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset,
int32_t bound_box_offset_x, int32_t bound_box_offset_y, int32_t bound_box_offset_z)
{
if (direction & 1)
{
return PaintAddImageAsChild(
session, image_id, y_offset, x_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset,
bound_box_offset_y, bound_box_offset_x, bound_box_offset_z);
}
return PaintAddImageAsChild(
session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
}
paint_struct* PaintAddImageAsChildRotated(
paint_session& session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset)

35
src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp
View File

@ -213,7 +213,8 @@ static void air_powered_vertical_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2 }, { 32, 28, 1 },
{ 0, 2, height });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], { 0, 0, height }, { 32, 20, 1 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -663,7 +664,8 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 20, 32, bbHeight }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, trackImageId, 0, 0, 20, 32, bbHeight, height, 0, 6, height);
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 20, 32, bbHeight }, { 0, 6, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -681,14 +683,16 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, trackImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
else
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, trackImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -707,14 +711,16 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, trackImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
else
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -734,7 +740,8 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
floorImageId = SPR_FLOOR_PLANKS | session.TrackColours[SCHEME_SUPPORTS];
}
PaintAddImageAsParent(session, floorImageId, { 0, 0, height }, { 26, 26, 126 }, { 3, 3, height });
PaintAddImageAsChildRotated(session, direction, supportsImageId, 0, 0, 26, 26, 126, height, 3, 3, height);
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 26, 26, 126 }, { 3, 3, height });
}
else
{
@ -749,13 +756,15 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
{
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
PaintAddImageAsChildRotated(session, direction, trackImageId, 0, 0, 5, 20, 79, height, 0, 6, height + 128);
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
}
else
{
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
PaintAddImageAsChildRotated(session, direction, supportsImageId, 0, 0, 1, 20, 126, height, 27, 6, height);
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -842,12 +851,12 @@ static void air_powered_vertical_rc_track_vertical_top(
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 32, 20, 15 }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, imageIdT, 0, 0, 31, 20, 15, height, 1, 6, height);
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 31, 20, 15 }, { 1, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
PaintAddImageAsChildRotated(session, direction, imageIdT, 0, 0, 5, 20, 1, height, 24, 6, height);
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
}
break;
case 1:
@ -880,12 +889,12 @@ static void air_powered_vertical_rc_track_vertical_top(
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
PaintAddImageAsChildRotated(session, direction, imageIdT, 0, 0, 5, 20, 1, height, 24, 6, height);
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 32, 20, 15 }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, imageIdT, 0, 0, 32, 20, 15, height, 0, 6, height);
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 32, 20, 15 }, { 0, 6, height });
}
break;
}

4
src/openrct2/ride/coaster/CompactInvertedCoaster.cpp
View File

@ -91,8 +91,8 @@ static void compact_inverted_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
height + 29);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);

4
src/openrct2/ride/coaster/FlyingRollerCoaster.cpp
View File

@ -157,8 +157,8 @@ static void flying_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 24 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0,
6, height + 24);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_1);
}

64
src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp
View File

@ -839,14 +839,14 @@ static void heartline_twister_rc_track_heartline_transfer_up(
session, direction, session.TrackColours[SCHEME_TRACK] | 21314, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21308, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21318, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21312, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 6, 5, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
@ -854,14 +854,14 @@ static void heartline_twister_rc_track_heartline_transfer_up(
session, direction, session.TrackColours[SCHEME_TRACK] | 21315, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21309, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21319, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21313, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 7, 6, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
@ -869,14 +869,14 @@ static void heartline_twister_rc_track_heartline_transfer_up(
session, direction, session.TrackColours[SCHEME_TRACK] | 21316, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21306, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21320, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21310, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 6, 7, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
@ -884,14 +884,14 @@ static void heartline_twister_rc_track_heartline_transfer_up(
session, direction, session.TrackColours[SCHEME_TRACK] | 21317, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21307, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21321, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21311, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 7, 8, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1053,14 +1053,14 @@ static void heartline_twister_rc_track_heartline_transfer_down(
session, direction, session.TrackColours[SCHEME_TRACK] | 21314, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21308, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21318, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21312, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 6, 5, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
@ -1068,14 +1068,14 @@ static void heartline_twister_rc_track_heartline_transfer_down(
session, direction, session.TrackColours[SCHEME_TRACK] | 21315, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21309, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21319, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21313, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 7, 6, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
@ -1083,14 +1083,14 @@ static void heartline_twister_rc_track_heartline_transfer_down(
session, direction, session.TrackColours[SCHEME_TRACK] | 21316, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21306, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21320, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21310, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 6, 7, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
@ -1098,14 +1098,14 @@ static void heartline_twister_rc_track_heartline_transfer_down(
session, direction, session.TrackColours[SCHEME_TRACK] | 21317, { 0, 0, height + 8 }, { 32, 20, 2 },
{ 0, 6, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height + 16, 0, 6,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21307, { 0, 0, height + 16 }, { 32, 20, 2 },
{ 0, 6, height + 16 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21321, { 0, 0, height + 8 }, { 32, 1, 34 },
{ 0, 27, height + 8 });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27,
height + 16);
session, direction, session.TrackColours[SCHEME_TRACK] | 21311, { 0, 0, height + 16 }, { 32, 1, 34 },
{ 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 7, 8, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

4
src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp
View File

@ -99,8 +99,8 @@ static void inverted_hairpin_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 24 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 6,
height + 24);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);

4
src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp
View File

@ -70,8 +70,8 @@ static void inverted_impulse_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
height + 29);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);

4
src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
View File

@ -90,8 +90,8 @@ static void inverted_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
height + 29);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);

4
src/openrct2/ride/coaster/LayDownRollerCoaster.cpp
View File

@ -157,8 +157,8 @@ static void lay_down_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 24 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0,
6, height + 24);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 11);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);

64
src/openrct2/ride/coaster/LoopingRollerCoaster.cpp
View File

@ -2224,8 +2224,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_CENTRED, 1, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15364, 16, 0, 3, 16, 119, height, 16, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15364, { 16, 0, height }, { 3, 16, 119 },
{ 16, 0, height });
break;
case 1:
PaintAddImageAsParentRotated(
@ -2234,8 +2234,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT_CENTRED, 0, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15366, 12, 0, 3, 16, 119, height, 12, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15366, { 12, 0, height }, { 3, 16, 119 },
{ 12, 0, height });
break;
case 2:
PaintAddImageAsParentRotated(
@ -2244,8 +2244,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK, 2, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15365, 10, 16, 4, 16, 119, height, 10, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15365, { 10, 16, height }, { 4, 16, 119 },
{ 10, 16, height });
break;
case 3:
PaintAddImageAsParentRotated(
@ -2254,8 +2254,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT, 3, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15367, 16, 16, 2, 16, 119, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15367, { 16, 16, height }, { 2, 16, 119 },
{ 16, 16, height });
break;
}
paint_util_set_segment_support_height(
@ -2332,8 +2332,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK, 2, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15365, 10, 16, 4, 16, 119, height, 10, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15365, { 10, 16, height }, { 4, 16, 119 },
{ 10, 16, height });
break;
case 1:
PaintAddImageAsParentRotated(
@ -2342,8 +2342,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT, 3, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15367, 16, 16, 2, 16, 119, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15367, { 16, 16, height }, { 2, 16, 119 },
{ 16, 16, height });
break;
case 2:
PaintAddImageAsParentRotated(
@ -2352,8 +2352,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_CENTRED, 1, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15364, 16, 0, 3, 16, 119, height, 16, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15364, { 16, 0, height }, { 3, 16, 119 },
{ 16, 0, height });
break;
case 3:
PaintAddImageAsParentRotated(
@ -2362,8 +2362,8 @@ static void looping_rc_track_left_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT_CENTRED, 0, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15366, 12, 0, 3, 16, 119, height, 12, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15366, { 12, 0, height }, { 3, 16, 119 },
{ 12, 0, height });
break;
}
paint_util_set_segment_support_height(
@ -2501,8 +2501,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK, 3, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15384, 16, 16, 2, 16, 119, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15384, { 16, 16, height }, { 2, 16, 119 },
{ 16, 16, height });
break;
case 1:
PaintAddImageAsParentRotated(
@ -2511,8 +2511,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT, 1, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15386, 10, 16, 4, 16, 119, height, 10, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15386, { 10, 16, height }, { 4, 16, 119 },
{ 10, 16, height });
break;
case 2:
PaintAddImageAsParentRotated(
@ -2521,8 +2521,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_CENTRED, 0, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15385, 12, 0, 3, 16, 119, height, 12, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15385, { 12, 0, height }, { 3, 16, 119 },
{ 12, 0, height });
break;
case 3:
PaintAddImageAsParentRotated(
@ -2531,8 +2531,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT_CENTRED, 2, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15387, 16, 0, 2, 16, 119, height, 16, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15387, { 16, 0, height }, { 2, 16, 119 },
{ 16, 0, height });
break;
}
paint_util_set_general_support_height(session, height + 168, 0x20);
@ -2597,8 +2597,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_CENTRED, 0, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15385, 12, 0, 3, 16, 119, height, 12, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15385, { 12, 0, height }, { 3, 16, 119 },
{ 12, 0, height });
break;
case 1:
PaintAddImageAsParentRotated(
@ -2607,8 +2607,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT_CENTRED, 2, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15387, 16, 0, 2, 16, 119, height, 16, 0,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15387, { 16, 0, height }, { 2, 16, 119 },
{ 16, 0, height });
break;
case 2:
PaintAddImageAsParentRotated(
@ -2617,8 +2617,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK, 3, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15384, 16, 16, 2, 16, 119, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15384, { 16, 16, height }, { 2, 16, 119 },
{ 16, 16, height });
break;
case 3:
PaintAddImageAsParentRotated(
@ -2627,8 +2627,8 @@ static void looping_rc_track_right_vertical_loop(
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_THICK_ALT, 1, 0, height - 8, session.TrackColours[SCHEME_TRACK]);
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 15386, 10, 16, 4, 16, 119, height, 10, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 15386, { 10, 16, height }, { 4, 16, 119 },
{ 10, 16, height });
break;
}
paint_util_set_general_support_height(session, height + 168, 0x20);

8
src/openrct2/ride/coaster/MineTrainCoaster.cpp
View File

@ -109,14 +109,14 @@ static void mine_train_rc_track_station(
{
bool isClosed = trackElement.BlockBrakeClosed();
PaintAddImageAsChildRotated(
session, direction, _MineTrainBlockBrakeImages[direction][isClosed] | session.TrackColours[SCHEME_TRACK], 0, 0, 32,
20, 1, height, 0, 0, height);
session, direction, _MineTrainBlockBrakeImages[direction][isClosed] | session.TrackColours[SCHEME_TRACK],
{ 0, 0, height }, { 32, 20, 1 }, { 0, 0, height });
}
else
{
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 0,
height);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], { 0, 0, height }, { 32, 20, 1 },
{ 0, 0, height });
}
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station(session, ride, direction, height, trackElement);

4
src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp
View File

@ -97,8 +97,8 @@ static void mini_suspended_rc_track_station(
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 6, height + 24 }, { 32, 20, 1 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 2,
height);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 2, height });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_1);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);

16
src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp
View File

@ -285,7 +285,8 @@ static void paint_reverse_freefall_rc_slope(
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, trackImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
int32_t tunnelOffset = tunnelOffsets03[trackSequence];
if (direction & 1)
@ -302,7 +303,8 @@ static void paint_reverse_freefall_rc_slope(
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
PaintAddImageAsChildRotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -323,8 +325,8 @@ static void paint_reverse_freefall_rc_slope(
}
PaintAddImageAsParent(session, floorImageId, { 0, 0, height }, { 26, 26, 126 }, { 3, 3, height });
PaintAddImageAsChildRotated(
session, direction, supportsImageId, 0, 0, isDirection03 ? 26 : 18, 26, 126, height, isDirection03 ? 3 : 11,
3, height);
session, direction, supportsImageId, { 0, 0, height }, { isDirection03 ? 26 : 18, 26, 126 },
{ isDirection03 ? 3 : 11, 3, height });
}
else
{
@ -340,13 +342,15 @@ static void paint_reverse_freefall_rc_slope(
{
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
PaintAddImageAsChildRotated(session, direction, trackImageId, 0, 0, 5, 20, 79, height, 0, 6, height + 128);
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
}
else
{
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
PaintAddImageAsChildRotated(session, direction, supportsImageId, 0, 0, 1, 20, 126, height, 27, 6, height);
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);

3
src/openrct2/ride/coaster/ReverserRollerCoaster.cpp
View File

@ -110,7 +110,8 @@ static void reverser_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station_2(session, ride, direction, height, trackElement, 9, 11);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);

3
src/openrct2/ride/coaster/Steeplechase.cpp
View File

@ -84,7 +84,8 @@ static void steeplechase_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2 }, { 32, 28, 3 },
{ 0, 2, height });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 3, height, 0, 0, height);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], { 0, 6, height }, { 32, 20, 3 },
{ 0, 0, height });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);

4
src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp
View File

@ -90,8 +90,8 @@ static void suspended_swinging_rc_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
height + 29);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 29 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 0);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);

8
src/openrct2/ride/coaster/WildMouse.cpp
View File

@ -207,14 +207,14 @@ static void wild_mouse_track_station(
{
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);
session, direction, _wild_mouse_block_brakes_image_ids[direction][isClosed] | session.TrackColours[SCHEME_TRACK],
{ 0, 0, height }, { 32, 20, 2 }, { 0, 0, height });
}
else
{
PaintAddImageAsChildRotated(
session, direction, _wild_mouse_brakes_image_ids[direction] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 2,
height, 0, 0, height);
session, direction, _wild_mouse_brakes_image_ids[direction] | session.TrackColours[SCHEME_TRACK], { 0, 0, height },
{ 32, 20, 2 }, { 0, 0, height });
}
track_paint_util_draw_station_metal_supports(session, direction, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(session, ride, direction, height, trackElement);

3635
src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

3
src/openrct2/ride/coaster/WoodenWildMouse.cpp
View File

@ -160,7 +160,8 @@ static void wooden_wild_mouse_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2 }, { 32, 28, 1 },
{ 0, 2, height });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 0, height);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], { 0, 6, height }, { 32, 20, 1 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);

2
src/openrct2/ride/gentle/GhostTrain.cpp
View File

@ -384,7 +384,7 @@ static void paint_ghost_train_station(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height - 2 }, { 32, 28, 3 }, { 0, 2, height });
imageId = ghost_train_track_pieces_flat[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsChildRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 0, height);
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 0, height });
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);

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

@ -649,24 +649,24 @@ static void paint_miniature_railway_track_flat(
imageId = miniature_railway_track_pieces_flat[direction] | session.TrackColours[SCHEME_TRACK];
if (!paintAsGravel)
{
PaintAddImageAsChildRotated(session, direction, imageId, 0, 6, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 6, height}, { 32, 20, 2}, { 0, 6, height);
}
else
{
imageIdAlt = miniature_railway_track_to_gravel(imageId);
PaintAddImageAsChildRotated(session, direction, imageIdAlt, 0, 6, 32, 20, 2, height, 0, 6, height);
imageIdAlt = miniature_railway_track_to_gravel(imageId});
PaintAddImageAsChildRotated(session, direction, imageIdAlt, { 0, 6, height}, { 32, 20, 2}, { 0, 6, height);
}
if (paintGrooved)
{
imageIdAlt = miniature_railway_track_to_grooved(imageId);
PaintAddImageAsChildRotated(session, direction, imageIdAlt, 0, 6, 32, 20, 2, height, 0, 6, height + 2);
imageIdAlt = miniature_railway_track_to_grooved(imageId});
PaintAddImageAsChildRotated(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);
PaintAddImageAsChildRotated(
session, direction,
(imageIdAlt & 0x7FFFF) | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT
| (EnumValue(FilterPaletteID::PaletteDarken2) << 19),
0, 6, 32, 20, 2, height, 0, 6, height + 2);
{ 0, 6, height }, { 32, 20, 2 }, { 0, 6, height + 2 });
}
}
else
@ -714,7 +714,7 @@ static void paint_miniature_railway_station(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height - 2 }, { 32, 28, 2 }, { 0, 2, height });
imageId = miniature_railway_track_pieces_flat_station[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsChildRotated(session, direction, imageId, 0, 6, 32, 20, 2, height, 0, 0, height);
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 2 }, { 0, 0, height });
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -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), bounds.x, bounds.y, 2,
height, offset.x, offset.y, height);
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 });
}
if (direction == 0 || direction == 2)
{
@ -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), bounds.x, bounds.y, 2,
height, offset.x, offset.y, height);
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 });
}
if (direction == 0 || direction == 2)

4
src/openrct2/ride/transport/SuspendedMonorail.cpp
View File

@ -70,8 +70,8 @@ static void suspended_monorail_track_station(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
PaintAddImageAsChildRotated(
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 32, 0, 6,
height + 32);
session, direction, imageIds[direction][2] | session.TrackColours[SCHEME_SUPPORTS], { 0, 6, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
track_paint_util_draw_station_inverted(session, ride, direction, height, trackElement, STATION_VARIANT_TALL);
paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);