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

Apply regex on PaintAddImageAsParentRotated2

This commit is contained in:
duncanspumpkin 2022-03-11 13:45:00 +00:00
parent b6175bb556
commit a5a00517ea
40 changed files with 30936 additions and 24987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/entity/Fountain.cpp
View File

@ -439,5 +439,6 @@ void JumpingFountain::Paint(paint_session& session, int32_t imageDirection) cons
auto bb = isAntiClockwise ? antiClockWiseBoundingBoxes : clockWiseBoundingBoxes;
PaintAddImageAsParentRotated(
session, imageDirection, imageId, 0, 0, 32, 1, 3, height, bb[imageDirection & 1].x, bb[imageDirection & 1].y, height);
session, imageDirection, imageId, { 0, 0, height }, { 32, 1, 3 },
{ bb[imageDirection & 1].x, bb[imageDirection & 1].y, height });
}

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* PaintAddImageAsParentRotated(
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, 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,

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

@ -11,23 +11,6 @@
#include "../ride/TrackPaint.h"
#include "Paint.h"
paint_struct* PaintAddImageAsParentRotated(
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 PaintAddImageAsParent(
session, image_id, { y_offset, x_offset, z_offset }, { bound_box_length_y, bound_box_length_x, bound_box_length_z },
{ bound_box_offset_y, bound_box_offset_x, bound_box_offset_z });
}
return PaintAddImageAsParent(
session, image_id, { x_offset, y_offset, z_offset }, { bound_box_length_x, bound_box_length_y, bound_box_length_z },
{ bound_box_offset_x, bound_box_offset_y, bound_box_offset_z });
}
paint_struct* PaintAddImageAsParentRotated(
paint_session& session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset)

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

@ -188,7 +188,7 @@ static void air_powered_vertical_rc_track_flat(
};
uint32_t imageId = imageIds[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -210,8 +210,8 @@ static void air_powered_vertical_rc_track_station(
};
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height - 2, 0, 2,
height);
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);
@ -329,12 +329,12 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (direction == 0 || direction == 1)
{
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -358,12 +358,12 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (direction == 2 || direction == 3)
{
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -510,11 +510,11 @@ static void air_powered_vertical_rc_track_left_bank(
uint32_t imageId = imageIds[direction] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 1)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -544,7 +544,7 @@ static void air_powered_vertical_rc_track_brakes(
};
uint32_t imageId = imageIds[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -661,7 +661,8 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
{
case 0:
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 20, 32, bbHeight, height, 0, 6, height);
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);
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -678,13 +679,15 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
{
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
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);
}
else
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
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);
}
@ -702,13 +705,15 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
if (isDirection03)
{
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
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);
}
else
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(session, direction, trackImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
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);
}
@ -733,7 +738,8 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
}
else
{
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 26, 26, 126, height, 3, 3, height);
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 26, 26, 126 }, { 3, 3, height });
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + supportHeights[trackSequence], 0x20);
@ -741,12 +747,14 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
case 6:
if (isDirection03)
{
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 5, 20, 79, height, 0, 6, height + 128);
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);
}
else
{
PaintAddImageAsParentRotated(session, direction, trackImageId, 0, 0, 1, 20, 126, height, 27, 6, height);
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);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -775,17 +783,17 @@ static void air_powered_vertical_rc_track_vertical_up(
{
case 0:
imageId = imageIds[direction][0] | air_powered_vertical_rc_get_support_colour(session);
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 26, 26, 79, height, 3, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 26, 26, 79 }, { 3, 3, height });
break;
case 1:
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 2, 20, 79, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 2, 20, 79 }, { 0, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 2, 20, 79, height, 30, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 2, 20, 79 }, { 30, 6, height });
}
paint_util_set_vertical_tunnel(session, height + 80);
@ -833,12 +841,12 @@ static void air_powered_vertical_rc_track_vertical_top(
imageIdT = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdS, 0, 0, 32, 20, 15, height, 0, 6, height);
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);
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdS, 0, 0, 5, 20, 1, height, 24, 6, height);
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);
}
break;
@ -846,11 +854,11 @@ static void air_powered_vertical_rc_track_vertical_top(
imageIdT = imageIds[direction][2] | session.TrackColours[SCHEME_TRACK];
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdT, 0, 0, 2, 20, 15, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 15 }, { 0, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdT, 0, 0, 2, 20, 1, height, 33, 6, height);
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 1 }, { 33, 6, height });
}
paint_util_set_vertical_tunnel(session, height + 80);
break;
@ -858,11 +866,11 @@ static void air_powered_vertical_rc_track_vertical_top(
imageIdT = imageIds[direction][3] | session.TrackColours[SCHEME_TRACK];
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdT, 0, 0, 2, 20, 1, height, 33, 6, height);
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 1 }, { 33, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdT, 0, 0, 2, 20, 15, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 15 }, { 0, 6, height });
}
paint_util_set_vertical_tunnel(session, height + 80);
break;
@ -871,12 +879,12 @@ static void air_powered_vertical_rc_track_vertical_top(
imageIdT = imageIds[direction][5] | session.TrackColours[SCHEME_TRACK];
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdS, 0, 0, 5, 20, 1, height, 24, 6, height);
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);
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdS, 0, 0, 32, 20, 15, height, 0, 6, height);
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);
}
break;
@ -946,7 +954,7 @@ static void air_powered_vertical_rc_track_onride_photo(
};
uint32_t imageId = imageIds[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);

2024
src/openrct2/ride/coaster/BobsleighCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

3486
src/openrct2/ride/coaster/BolligerMabillardTrack.hpp
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

2428
src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

2654
src/openrct2/ride/coaster/GigaCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

3217
src/openrct2/ride/coaster/HybridCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -29,23 +29,23 @@ static void inverted_hairpin_rc_track_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17030, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17030, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17031, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17031, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17032, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17032, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17033, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17033, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
}
}
@ -56,14 +56,14 @@ static void inverted_hairpin_rc_track_flat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17026, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17026, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17027, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17027, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
}
}
@ -93,10 +93,11 @@ static void inverted_hairpin_rc_track_station(
};
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_MISC], { 0, 0, height }, { 32, 28, 1 },
{ 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 24);
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);
@ -118,23 +119,23 @@ static void inverted_hairpin_rc_track_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17070, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17070, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17071, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17071, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17072, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17072, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17073, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17073, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
}
}
@ -144,23 +145,23 @@ static void inverted_hairpin_rc_track_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17042, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17042, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17043, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17043, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17044, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17044, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17045, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 40);
session, direction, session.TrackColours[SCHEME_TRACK] | 17045, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
break;
}
}
@ -212,23 +213,23 @@ static void inverted_hairpin_rc_track_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17086, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 88);
session, direction, session.TrackColours[SCHEME_TRACK] | 17086, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 88 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17087, 0, 0, 32, 2, 81, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17087, { 0, 0, height + 24 }, { 32, 2, 81 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17088, 0, 0, 32, 2, 81, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17088, { 0, 0, height + 24 }, { 32, 2, 81 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17089, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 88);
session, direction, session.TrackColours[SCHEME_TRACK] | 17089, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 88 });
break;
}
}
@ -238,23 +239,23 @@ static void inverted_hairpin_rc_track_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17058, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 88);
session, direction, session.TrackColours[SCHEME_TRACK] | 17058, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 88 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17059, 0, 0, 32, 2, 81, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17059, { 0, 0, height + 24 }, { 32, 2, 81 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17060, 0, 0, 32, 2, 81, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17060, { 0, 0, height + 24 }, { 32, 2, 81 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17061, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 88);
session, direction, session.TrackColours[SCHEME_TRACK] | 17061, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 88 });
break;
}
}
@ -282,23 +283,23 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17062, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17062, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17063, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17063, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17064, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17064, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17065, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17065, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
}
}
@ -308,23 +309,23 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17034, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17034, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17035, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17035, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17036, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17036, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17037, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17037, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
}
}
@ -376,29 +377,29 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17074, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17074, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17078, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17078, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17075, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17075, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17079, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17079, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17076, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17076, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17077, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17077, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
}
}
@ -408,29 +409,29 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17046, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17046, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17050, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17050, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17047, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17047, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17051, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17051, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17048, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17048, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17049, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17049, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
}
}
@ -458,29 +459,29 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17080, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17080, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17084, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17084, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17081, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17081, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17085, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17085, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17082, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17082, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17083, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17083, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
}
}
@ -490,29 +491,29 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17052, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17052, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17056, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17056, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17053, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17053, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17057, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17057, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17054, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17054, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17055, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17055, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 56 });
break;
}
}
@ -564,23 +565,23 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17066, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17066, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17067, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17067, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17068, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17068, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17069, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17069, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
}
}
@ -590,23 +591,23 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17038, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17038, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17039, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17039, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17040, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17040, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17041, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 32);
session, direction, session.TrackColours[SCHEME_TRACK] | 17041, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
break;
}
}
@ -707,23 +708,23 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17123, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17123, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 22 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17126, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17126, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 22 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17129, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17129, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 22 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17120, 0, 0, 32, 20, 3, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17120, { 0, 0, height + 24 }, { 32, 20, 3 },
{ 0, 6, height + 22 });
break;
}
@ -747,23 +748,23 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17122, 0, 0, 16, 16, 3, height + 24, 16, 0,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17122, { 0, 0, height + 24 }, { 16, 16, 3 },
{ 16, 0, height + 22 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17125, 0, 0, 16, 16, 3, height + 24, 0, 0,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17125, { 0, 0, height + 24 }, { 16, 16, 3 },
{ 0, 0, height + 22 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17128, 0, 0, 16, 16, 3, height + 24, 0, 16,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17128, { 0, 0, height + 24 }, { 16, 16, 3 },
{ 0, 16, height + 22 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17119, 0, 0, 16, 16, 3, height + 24, 16, 16,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17119, { 0, 0, height + 24 }, { 16, 16, 3 },
{ 16, 16, height + 22 });
break;
}
paint_util_set_segment_support_height(
@ -775,23 +776,23 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17121, 0, 0, 20, 32, 3, height + 24, 6, 0,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17121, { 0, 0, height + 24 }, { 20, 32, 3 },
{ 6, 0, height + 22 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17124, 0, 0, 20, 32, 3, height + 24, 6, 0,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17124, { 0, 0, height + 24 }, { 20, 32, 3 },
{ 6, 0, height + 22 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17127, 0, 0, 20, 32, 3, height + 24, 6, 0,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17127, { 0, 0, height + 24 }, { 20, 32, 3 },
{ 6, 0, height + 22 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17118, 0, 0, 20, 32, 3, height + 24, 6, 0,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17118, { 0, 0, height + 24 }, { 20, 32, 3 },
{ 6, 0, height + 22 });
break;
}
@ -1027,23 +1028,23 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17114, 0, 0, 26, 24, 3, height + 24, 6, 2,
height + 24);
session, direction, session.TrackColours[SCHEME_TRACK] | 17114, { 0, 0, height + 24 }, { 26, 24, 3 },
{ 6, 2, height + 24 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17115, 0, 0, 26, 26, 3, height + 24, 0, 0,
height + 24);
session, direction, session.TrackColours[SCHEME_TRACK] | 17115, { 0, 0, height + 24 }, { 26, 26, 3 },
{ 0, 0, height + 24 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17116, 0, 0, 24, 26, 3, height + 24, 2, 6,
height + 24);
session, direction, session.TrackColours[SCHEME_TRACK] | 17116, { 0, 0, height + 24 }, { 24, 26, 3 },
{ 2, 6, height + 24 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17117, 0, 0, 24, 24, 3, height + 24, 6, 6,
height + 24);
session, direction, session.TrackColours[SCHEME_TRACK] | 17117, { 0, 0, height + 24 }, { 24, 24, 3 },
{ 6, 6, height + 24 });
break;
}
@ -1087,29 +1088,29 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17102, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17102, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 56 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17106, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17106, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17103, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17103, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17107, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17107, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17104, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17104, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17105, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17105, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 56 });
break;
}
}
@ -1119,29 +1120,29 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17090, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17090, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 56 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17094, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17094, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17091, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17091, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17095, 0, 0, 32, 10, 49, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17095, { 0, 0, height + 24 }, { 32, 10, 49 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17092, 0, 0, 32, 2, 49, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17092, { 0, 0, height + 24 }, { 32, 2, 49 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17093, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 56);
session, direction, session.TrackColours[SCHEME_TRACK] | 17093, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 56 });
break;
}
}
@ -1169,29 +1170,29 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17108, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 48);
session, direction, session.TrackColours[SCHEME_TRACK] | 17108, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 48 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17112, 0, 0, 32, 10, 41, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17112, { 0, 0, height + 24 }, { 32, 10, 41 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17109, 0, 0, 32, 2, 41, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17109, { 0, 0, height + 24 }, { 32, 2, 41 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17113, 0, 0, 32, 10, 41, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17113, { 0, 0, height + 24 }, { 32, 10, 41 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17110, 0, 0, 32, 2, 41, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17110, { 0, 0, height + 24 }, { 32, 2, 41 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17111, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 48);
session, direction, session.TrackColours[SCHEME_TRACK] | 17111, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 48 });
break;
}
}
@ -1201,29 +1202,29 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17096, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 48);
session, direction, session.TrackColours[SCHEME_TRACK] | 17096, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 48 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17100, 0, 0, 32, 10, 41, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17100, { 0, 0, height + 24 }, { 32, 10, 41 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17097, 0, 0, 32, 2, 41, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17097, { 0, 0, height + 24 }, { 32, 2, 41 },
{ 0, 4, height + 6 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17101, 0, 0, 32, 10, 41, height + 24, 0, 10,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17101, { 0, 0, height + 24 }, { 32, 10, 41 },
{ 0, 10, height + 6 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17098, 0, 0, 32, 2, 41, height + 24, 0, 4,
height + 6);
session, direction, session.TrackColours[SCHEME_TRACK] | 17098, { 0, 0, height + 24 }, { 32, 2, 41 },
{ 0, 4, height + 6 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17099, 0, 0, 30, 20, 3, height + 24, 0, 6,
height + 48);
session, direction, session.TrackColours[SCHEME_TRACK] | 17099, { 0, 0, height + 24 }, { 30, 20, 3 },
{ 0, 6, height + 48 });
break;
}
}
@ -1287,14 +1288,14 @@ static void inverted_hairpin_rc_track_brakes(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17028, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17028, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17029, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17029, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
}
@ -1320,14 +1321,14 @@ static void inverted_hairpin_rc_track_block_brakes(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17028, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17028, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 17029, 0, 0, 32, 20, 1, height + 24, 0, 6,
height + 22);
session, direction, session.TrackColours[SCHEME_TRACK] | 17029, { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
break;
}

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

@ -28,14 +28,14 @@ static void inverted_impulse_rc_track_flat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19662, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 29);
session, direction, session.TrackColours[SCHEME_TRACK] | 19662, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19663, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 29);
session, direction, session.TrackColours[SCHEME_TRACK] | 19663, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
break;
}
@ -64,10 +64,11 @@ static void inverted_impulse_rc_track_station(
};
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_MISC], { 0, 0, height }, { 32, 28, 1 },
{ 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 29);
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);
@ -87,23 +88,23 @@ static void inverted_impulse_rc_track_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19672, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 45);
session, direction, session.TrackColours[SCHEME_TRACK] | 19672, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19673, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 45);
session, direction, session.TrackColours[SCHEME_TRACK] | 19673, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19674, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 45);
session, direction, session.TrackColours[SCHEME_TRACK] | 19674, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19675, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 45);
session, direction, session.TrackColours[SCHEME_TRACK] | 19675, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
break;
}
@ -152,23 +153,23 @@ static void inverted_impulse_rc_track_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19688, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 93);
session, direction, session.TrackColours[SCHEME_TRACK] | 19688, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 93 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19689, 0, 0, 32, 2, 81, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19689, { 0, 0, height + 29 }, { 32, 2, 81 },
{ 0, 4, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19690, 0, 0, 32, 2, 81, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19690, { 0, 0, height + 29 }, { 32, 2, 81 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19691, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 93);
session, direction, session.TrackColours[SCHEME_TRACK] | 19691, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 93 });
break;
}
if (direction == 0 || direction == 3)
@ -193,23 +194,23 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19664, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19664, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19665, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19665, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19666, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19666, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19667, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19667, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
}
@ -255,29 +256,29 @@ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19676, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 61);
session, direction, session.TrackColours[SCHEME_TRACK] | 19676, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19680, 0, 0, 32, 10, 49, height + 29, 0, 10,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19680, { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19677, 0, 0, 32, 2, 49, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19677, { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19681, 0, 0, 32, 10, 49, height + 29, 0, 10,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19681, { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19678, 0, 0, 32, 2, 49, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19678, { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19679, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 61);
session, direction, session.TrackColours[SCHEME_TRACK] | 19679, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
break;
}
if (direction == 0 || direction == 3)
@ -302,29 +303,29 @@ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19682, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 61);
session, direction, session.TrackColours[SCHEME_TRACK] | 19682, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19686, 0, 0, 32, 10, 49, height + 29, 0, 10,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19686, { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19683, 0, 0, 32, 2, 49, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19683, { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19687, 0, 0, 32, 10, 49, height + 29, 0, 10,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19687, { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19684, 0, 0, 32, 2, 49, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19684, { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19685, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 61);
session, direction, session.TrackColours[SCHEME_TRACK] | 19685, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
break;
}
if (direction == 0 || direction == 3)
@ -349,23 +350,23 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19668, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19668, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19669, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19669, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19670, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19670, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19671, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 37);
session, direction, session.TrackColours[SCHEME_TRACK] | 19671, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
break;
}
@ -462,23 +463,23 @@ static void inverted_impulse_rc_track_90_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19700, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 61);
session, direction, session.TrackColours[SCHEME_TRACK] | 19700, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19701, 0, 0, 32, 2, 31, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19701, { 0, 0, height + 29 }, { 32, 2, 31 },
{ 0, 4, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19702, 0, 0, 32, 2, 31, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19702, { 0, 0, height + 29 }, { 32, 2, 31 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19703, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 61);
session, direction, session.TrackColours[SCHEME_TRACK] | 19703, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
break;
}
paint_util_set_vertical_tunnel(session, height + 32);
@ -511,23 +512,23 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19692, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 85);
session, direction, session.TrackColours[SCHEME_TRACK] | 19692, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19693, 0, 0, 32, 2, 55, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19693, { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19694, 0, 0, 32, 2, 55, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19694, { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19695, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 85);
session, direction, session.TrackColours[SCHEME_TRACK] | 19695, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
break;
}
if (direction == 0 || direction == 3)
@ -561,23 +562,23 @@ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19696, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 85);
session, direction, session.TrackColours[SCHEME_TRACK] | 19696, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19697, 0, 0, 32, 2, 55, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19697, { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19698, 0, 0, 32, 2, 55, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19698, { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19699, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 85);
session, direction, session.TrackColours[SCHEME_TRACK] | 19699, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
break;
}
switch (direction)
@ -606,23 +607,23 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19698, 0, 0, 32, 2, 55, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19698, { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19699, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 85);
session, direction, session.TrackColours[SCHEME_TRACK] | 19699, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19696, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 85);
session, direction, session.TrackColours[SCHEME_TRACK] | 19696, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19697, 0, 0, 32, 2, 55, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19697, { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
break;
}
if (direction == 0 || direction == 3)
@ -650,32 +651,32 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19708, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19708, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19709, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19709, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19717, 0, 0, 2, 32, 31, height + 29, 4, 0,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19717, { 0, 0, height + 29 }, { 2, 32, 31 },
{ 4, 0, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19710, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19710, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19718, 0, 0, 32, 2, 31, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19718, { 0, 0, height + 29 }, { 32, 2, 31 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19711, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19711, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19719, 0, 0, 32, 2, 31, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19719, { 0, 0, height + 29 }, { 32, 2, 31 },
{ 0, 4, height + 11 });
break;
}
paint_util_set_vertical_tunnel(session, height + 96);
@ -700,32 +701,32 @@ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19704, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19704, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19712, 0, 0, 32, 2, 31, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19712, { 0, 0, height + 29 }, { 32, 2, 31 },
{ 0, 4, height + 11 });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19705, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19705, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19713, 0, 0, 32, 2, 31, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19713, { 0, 0, height + 29 }, { 32, 2, 31 },
{ 0, 4, height + 11 });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19706, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19706, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19714, 0, 0, 32, 2, 31, height + 29, 0, 4,
height + 11);
session, direction, session.TrackColours[SCHEME_TRACK] | 19714, { 0, 0, height + 29 }, { 32, 2, 31 },
{ 0, 4, height + 11 });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 19707, 0, 0, 32, 20, 3, height + 29, 0, 6,
height + 125);
session, direction, session.TrackColours[SCHEME_TRACK] | 19707, { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 125 });
break;
}
paint_util_set_vertical_tunnel(session, height + 96);

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

File diff suppressed because it is too large Load Diff

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

@ -5909,7 +5909,7 @@ static void junior_rc_track_on_ride_photo(
session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK, 8, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
break;
case 1:
PaintAddImageAsParentRotated(
@ -5918,7 +5918,7 @@ static void junior_rc_track_on_ride_photo(
session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 7, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
break;
case 2:
PaintAddImageAsParentRotated(
@ -5927,7 +5927,7 @@ static void junior_rc_track_on_ride_photo(
session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK, 8, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
break;
case 3:
PaintAddImageAsParentRotated(
@ -5936,7 +5936,7 @@ static void junior_rc_track_on_ride_photo(
session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 7, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height, 0, 6, height + 3);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
break;
}
track_paint_util_onride_photo_paint(session, direction, height + 3 + photoCameraOffset, trackElement);

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

File diff suppressed because it is too large Load Diff

664
src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

1536
src/openrct2/ride/coaster/MineRide.cpp
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

2320
src/openrct2/ride/coaster/MiniRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

3918
src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -283,7 +283,8 @@ static void paint_reverse_freefall_rc_slope(
if (isDirection03)
{
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
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);
int32_t tunnelOffset = tunnelOffsets03[trackSequence];
@ -299,7 +300,8 @@ static void paint_reverse_freefall_rc_slope(
else
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(session, direction, trackImageId, 0, 0, 32, 20, bbHeight, height, 0, 6, height);
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);
}
@ -327,8 +329,8 @@ static void paint_reverse_freefall_rc_slope(
else
{
PaintAddImageAsParentRotated(
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 });
}
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(session, height + supportHeights[trackSequence], 0x20);
@ -336,12 +338,14 @@ static void paint_reverse_freefall_rc_slope(
case 6:
if (isDirection03)
{
PaintAddImageAsParentRotated(session, direction, supportsImageId, 0, 0, 5, 20, 79, height, 0, 6, height + 128);
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);
}
else
{
PaintAddImageAsParentRotated(session, direction, trackImageId, 0, 0, 1, 20, 126, height, 27, 6, height);
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);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -369,11 +373,13 @@ static void paint_reverse_freefall_rc_vertical(
trackImageId = reverse_freefall_rc_track_pieces_vertical[direction] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, trackImageId, 0, 0, 2, 20, 79, height, 0, 6, height);
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 2, 20, 79 }, { 0, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, trackImageId, 0, 0, 2, 20, 79, height, 30, 6, height);
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 2, 20, 79 }, { 30, 6, height });
}
paint_util_set_vertical_tunnel(session, height + 80);
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -405,7 +411,7 @@ static void paint_reverse_freefall_rc_onride_photo(
}
uint32_t imageId = imageIds[direction] | colour;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);

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

@ -57,13 +57,15 @@ static void reverser_rc_track_flat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21520, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21520, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21521, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21521, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -75,13 +77,15 @@ static void reverser_rc_track_flat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21504, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21504, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21505, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21505, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -103,7 +107,8 @@ static void reverser_rc_track_station(
};
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], 0, 0, 32, 27, 2, height, 0, 2, height);
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);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -124,22 +129,26 @@ static void reverser_rc_track_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21530, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21530, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21531, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21531, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21532, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21532, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21533, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21533, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -150,22 +159,26 @@ static void reverser_rc_track_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21516, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21516, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21517, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21517, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21518, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21518, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21519, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21519, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -193,22 +206,26 @@ static void reverser_rc_track_flat_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21522, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21522, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21523, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21523, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21524, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21524, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21525, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21525, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -219,22 +236,26 @@ static void reverser_rc_track_flat_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21508, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21508, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21509, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21509, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21510, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21510, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21511, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21511, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -262,22 +283,26 @@ static void reverser_rc_track_25_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21526, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21526, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21527, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21527, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21528, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21528, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21529, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21529, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -288,22 +313,26 @@ static void reverser_rc_track_25_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21512, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21512, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21513, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21513, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21514, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21514, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21515, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21515, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -546,22 +575,26 @@ static void reverser_rc_track_s_bend_left(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21566, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21566, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21570, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21570, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21569, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21569, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21573, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21573, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -577,22 +610,26 @@ static void reverser_rc_track_s_bend_left(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21567, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21567, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21571, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21571, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21568, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21568, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21572, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21572, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -608,22 +645,26 @@ static void reverser_rc_track_s_bend_left(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21568, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21568, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21572, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21572, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21567, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21567, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21571, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21571, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -639,22 +680,26 @@ static void reverser_rc_track_s_bend_left(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21569, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21569, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21573, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21573, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21566, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21566, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21570, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21570, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -685,22 +730,26 @@ static void reverser_rc_track_s_bend_right(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21574, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21574, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21578, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21578, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21577, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21577, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21581, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21581, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -716,22 +765,26 @@ static void reverser_rc_track_s_bend_right(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21575, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21575, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21579, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21579, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21576, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21576, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21580, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21580, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -747,22 +800,26 @@ static void reverser_rc_track_s_bend_right(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21576, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21576, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21580, 0, 0, 32, 26, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21580, { 0, 0, height }, { 32, 26, 2 },
{ 0, 0, height });
wooden_a_supports_paint_setup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21575, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21575, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21579, 0, 0, 32, 26, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21579, { 0, 0, height }, { 32, 26, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -778,22 +835,26 @@ static void reverser_rc_track_s_bend_right(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21577, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21577, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21581, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21581, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21574, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21574, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21578, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21578, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -824,22 +885,26 @@ static void reverser_rc_track_left_quarter_turn_3(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21559, 0, 0, 32, 20, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21559, { 0, 0, height }, { 32, 20, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21562, 0, 0, 32, 20, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21562, { 0, 0, height }, { 32, 20, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21565, 0, 0, 32, 20, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21565, { 0, 0, height }, { 32, 20, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21556, 0, 0, 32, 20, 2, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21556, { 0, 0, height }, { 32, 20, 2 },
{ 0, 6, height });
wooden_a_supports_paint_setup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -858,20 +923,23 @@ static void reverser_rc_track_left_quarter_turn_3(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21558, 0, 0, 16, 16, 2, height, 16, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21558, { 0, 0, height }, { 16, 16, 2 },
{ 16, 0, height });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21561, 0, 0, 16, 16, 2, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21561, { 0, 0, height }, { 16, 16, 2 },
{ 0, 0, height });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21564, 0, 0, 16, 16, 2, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21564, { 0, 0, height }, { 16, 16, 2 },
{ 0, 16, height });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21555, 0, 0, 16, 16, 2, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21555, { 0, 0, height }, { 16, 16, 2 },
{ 16, 16, height });
break;
}
paint_util_set_segment_support_height(
@ -883,22 +951,26 @@ static void reverser_rc_track_left_quarter_turn_3(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21557, 0, 0, 20, 32, 2, height, 6, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21557, { 0, 0, height }, { 20, 32, 2 },
{ 6, 0, height });
wooden_a_supports_paint_setup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21560, 0, 0, 20, 32, 2, height, 6, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21560, { 0, 0, height }, { 20, 32, 2 },
{ 6, 0, height });
wooden_a_supports_paint_setup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21563, 0, 0, 20, 32, 2, height, 6, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21563, { 0, 0, height }, { 20, 32, 2 },
{ 6, 0, height });
wooden_a_supports_paint_setup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21554, 0, 0, 20, 32, 2, height, 6, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21554, { 0, 0, height }, { 20, 32, 2 },
{ 6, 0, height });
wooden_a_supports_paint_setup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -936,13 +1008,15 @@ static void reverser_rc_track_brakes(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21506, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21506, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21507, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21507, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -963,22 +1037,26 @@ static void reverser_rc_track_left_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21582, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21582, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21588, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21588, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21594, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21594, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21600, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21600, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -994,22 +1072,26 @@ static void reverser_rc_track_left_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21585, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21585, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21591, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21591, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21597, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21597, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21603, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21603, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1021,22 +1103,26 @@ static void reverser_rc_track_left_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21586, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21586, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21592, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21592, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21598, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21598, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21604, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21604, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1048,22 +1134,26 @@ static void reverser_rc_track_left_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21587, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21587, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21593, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21593, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21599, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21599, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21605, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21605, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1075,22 +1165,26 @@ static void reverser_rc_track_left_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21583, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21583, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21589, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21589, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21595, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21595, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21601, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21601, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1102,22 +1196,26 @@ static void reverser_rc_track_left_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21584, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21584, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21590, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21590, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21596, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21596, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21602, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21602, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1148,22 +1246,26 @@ static void reverser_rc_track_right_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21596, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21596, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21602, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21602, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21584, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21584, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21590, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21590, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1179,22 +1281,26 @@ static void reverser_rc_track_right_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21599, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21599, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21605, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21605, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21587, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21587, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21593, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21593, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1206,22 +1312,26 @@ static void reverser_rc_track_right_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21598, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21598, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21604, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21604, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21586, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21586, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21592, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21592, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1233,22 +1343,26 @@ static void reverser_rc_track_right_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21597, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21597, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21603, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21603, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21585, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21585, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21591, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21591, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1260,22 +1374,26 @@ static void reverser_rc_track_right_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21595, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21595, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21601, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21601, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21583, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21583, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21589, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21589, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1287,22 +1405,26 @@ static void reverser_rc_track_right_reverser(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21594, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21594, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21600, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21600, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21582, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21582, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 21588, 0, 0, 32, 27, 2, height, 0, 2, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 21588, { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

1315
src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

3806
src/openrct2/ride/coaster/SingleRailRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

1642
src/openrct2/ride/coaster/StandUpRollerCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -81,8 +81,8 @@ static void steeplechase_track_station(
};
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], 0, 0, 32, 28, 3, height - 2, 0, 2,
height);
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);
track_paint_util_draw_station_metal_supports_2(session, direction, height, session.TrackColours[SCHEME_SUPPORTS], 3);
@ -990,25 +990,29 @@ static void steeplechase_track_left_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28725, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28725, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28729, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28729, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28733, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28733, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28737, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28737, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1026,19 +1030,23 @@ static void steeplechase_track_left_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28726, 0, 0, 32, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28726, { 0, 0, height }, { 32, 16, 3 },
{ 0, 0, height });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28730, 0, 0, 34, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28730, { 0, 0, height }, { 34, 16, 3 },
{ 0, 0, height });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28734, 0, 0, 32, 16, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28734, { 0, 0, height }, { 32, 16, 3 },
{ 0, 16, height });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28738, 0, 0, 32, 16, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28738, { 0, 0, height }, { 32, 16, 3 },
{ 0, 16, height });
break;
}
paint_util_set_segment_support_height(
@ -1053,20 +1061,23 @@ static void steeplechase_track_left_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28727, 0, 0, 16, 16, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28727, { 0, 0, height }, { 16, 16, 3 },
{ 0, 16, height });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28731, 0, 0, 16, 16, 3, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28731, { 0, 0, height }, { 16, 16, 3 },
{ 16, 16, height });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28735, 0, 0, 16, 16, 3, height, 16, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28735, { 0, 0, height }, { 16, 16, 3 },
{ 16, 0, height });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28739, 0, 0, 16, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28739, { 0, 0, height }, { 16, 16, 3 },
{ 0, 0, height });
break;
}
paint_util_set_segment_support_height(
@ -1084,26 +1095,29 @@ static void steeplechase_track_left_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28728, 0, 0, 16, 16, 3, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28728, { 0, 0, height }, { 16, 16, 3 },
{ 16, 16, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28732, 0, 0, 16, 18, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28732, { 0, 0, height }, { 16, 18, 3 },
{ 0, 16, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28736, 0, 0, 16, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28736, { 0, 0, height }, { 16, 16, 3 },
{ 0, 0, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28740, 0, 0, 16, 16, 3, height, 16, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28740, { 0, 0, height }, { 16, 16, 3 },
{ 16, 0, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1130,25 +1144,29 @@ static void steeplechase_track_right_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28709, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28709, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28713, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28713, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28717, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28717, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28721, 0, 0, 32, 20, 3, height, 0, 6, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28721, { 0, 0, height }, { 32, 20, 3 },
{ 0, 6, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1166,19 +1184,23 @@ static void steeplechase_track_right_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28710, 0, 0, 32, 16, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28710, { 0, 0, height }, { 32, 16, 3 },
{ 0, 16, height });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28714, 0, 0, 32, 16, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28714, { 0, 0, height }, { 32, 16, 3 },
{ 0, 16, height });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28718, 0, 0, 34, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28718, { 0, 0, height }, { 34, 16, 3 },
{ 0, 0, height });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28722, 0, 0, 32, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28722, { 0, 0, height }, { 32, 16, 3 },
{ 0, 0, height });
break;
}
paint_util_set_segment_support_height(
@ -1193,19 +1215,23 @@ static void steeplechase_track_right_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28711, 0, 0, 16, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28711, { 0, 0, height }, { 16, 16, 3 },
{ 0, 0, height });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28715, 0, 0, 16, 16, 3, height, 16, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28715, { 0, 0, height }, { 16, 16, 3 },
{ 16, 0, height });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28719, 0, 0, 28, 28, 3, height, 4, 4, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28719, { 0, 0, height }, { 28, 28, 3 },
{ 4, 4, height });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28723, 0, 0, 16, 16, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28723, { 0, 0, height }, { 16, 16, 3 },
{ 0, 16, height });
break;
}
paint_util_set_segment_support_height(
@ -1223,26 +1249,29 @@ static void steeplechase_track_right_eighth_to_diag(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28712, 0, 0, 16, 16, 3, height, 16, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28712, { 0, 0, height }, { 16, 16, 3 },
{ 16, 0, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28716, 0, 0, 16, 16, 3, height, 0, 0, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28716, { 0, 0, height }, { 16, 16, 3 },
{ 0, 0, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28720, 0, 0, 16, 18, 3, height, 0, 16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28720, { 0, 0, height }, { 16, 18, 3 },
{ 0, 16, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28724, 0, 0, 16, 16, 3, height, 16, 16,
height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28724, { 0, 0, height }, { 16, 16, 3 },
{ 16, 16, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1289,8 +1318,8 @@ static void steeplechase_track_diag_flat(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28760, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28760, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1300,8 +1329,8 @@ static void steeplechase_track_diag_flat(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28744, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28744, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1316,8 +1345,8 @@ static void steeplechase_track_diag_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28757, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28757, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1327,8 +1356,8 @@ static void steeplechase_track_diag_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28741, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28741, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1343,8 +1372,8 @@ static void steeplechase_track_diag_flat(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28759, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28759, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1354,8 +1383,8 @@ static void steeplechase_track_diag_flat(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28743, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28743, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1374,8 +1403,8 @@ static void steeplechase_track_diag_flat(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28758, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28758, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1399,8 +1428,8 @@ static void steeplechase_track_diag_flat(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28742, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28742, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1435,8 +1464,8 @@ static void steeplechase_track_diag_25_deg_up(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28772, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28772, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1446,8 +1475,8 @@ static void steeplechase_track_diag_25_deg_up(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28756, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28756, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1462,8 +1491,8 @@ static void steeplechase_track_diag_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28769, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28769, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1473,8 +1502,8 @@ static void steeplechase_track_diag_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28753, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28753, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1489,8 +1518,8 @@ static void steeplechase_track_diag_25_deg_up(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28771, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28771, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1500,8 +1529,8 @@ static void steeplechase_track_diag_25_deg_up(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28755, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28755, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1520,8 +1549,8 @@ static void steeplechase_track_diag_25_deg_up(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28770, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28770, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1545,8 +1574,8 @@ static void steeplechase_track_diag_25_deg_up(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28754, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28754, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1581,8 +1610,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28764, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28764, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1592,8 +1621,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28748, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28748, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1608,8 +1637,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28761, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28761, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1619,8 +1648,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28745, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28745, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1635,8 +1664,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28763, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28763, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1646,8 +1675,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28747, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28747, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1666,8 +1695,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28762, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28762, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1691,8 +1720,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28746, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28746, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1727,8 +1756,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28768, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28768, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1738,8 +1767,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28752, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28752, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1754,8 +1783,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28765, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28765, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1765,8 +1794,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28749, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28749, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1781,8 +1810,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28767, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28767, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1792,8 +1821,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28751, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28751, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1812,8 +1841,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28766, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28766, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1837,8 +1866,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28750, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28750, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1873,8 +1902,8 @@ static void steeplechase_track_diag_25_deg_down(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28770, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28770, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1884,8 +1913,8 @@ static void steeplechase_track_diag_25_deg_down(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28754, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28754, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1900,8 +1929,8 @@ static void steeplechase_track_diag_25_deg_down(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28771, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28771, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1911,8 +1940,8 @@ static void steeplechase_track_diag_25_deg_down(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28755, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28755, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1927,8 +1956,8 @@ static void steeplechase_track_diag_25_deg_down(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28769, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28769, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1938,8 +1967,8 @@ static void steeplechase_track_diag_25_deg_down(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28753, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28753, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -1958,8 +1987,8 @@ static void steeplechase_track_diag_25_deg_down(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28772, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28772, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1983,8 +2012,8 @@ static void steeplechase_track_diag_25_deg_down(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28756, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28756, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2019,8 +2048,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28766, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28766, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2030,8 +2059,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28750, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28750, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2045,8 +2074,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28767, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28767, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2056,8 +2085,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28751, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28751, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2071,8 +2100,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28765, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28765, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2082,8 +2111,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28749, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28749, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2101,8 +2130,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28768, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28768, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2126,8 +2155,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28752, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28752, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2163,8 +2192,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28762, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28762, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2174,8 +2203,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
{
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28746, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28746, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2190,8 +2219,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28763, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28763, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2201,8 +2230,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28747, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28747, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2217,8 +2246,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28761, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28761, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2228,8 +2257,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
{
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28745, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28745, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
break;
}
}
@ -2248,8 +2277,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28764, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28764, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2273,8 +2302,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK] | 28748, -16, -16, 32, 32, 3, height, -16,
-16, height);
session, direction, session.TrackColours[SCHEME_TRACK] | 28748, { -16, -16, height }, { 32, 32, 3 },
{ -16, -16, height });
metal_b_supports_paint_setup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;

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

File diff suppressed because it is too large Load Diff

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

@ -177,7 +177,7 @@ static void wild_mouse_track_flat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -201,11 +201,12 @@ static void wild_mouse_track_station(
int32_t trackType = trackElement.GetTrackType();
PaintAddImageAsParentRotated(
session, direction, baseImageIds[direction] | session.TrackColours[SCHEME_MISC], 0, 0, 32, 28, 2, height - 2, 0, 2,
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();
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);
@ -237,7 +238,7 @@ static void wild_mouse_track_25_deg_up(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -271,11 +272,11 @@ static void wild_mouse_track_60_deg_up(
uint32_t imageId = imageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -315,7 +316,7 @@ static void wild_mouse_track_flat_to_25_deg_up(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -4, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -356,12 +357,12 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(
uint32_t frontImageId = frontImageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -403,12 +404,12 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(
uint32_t frontImageId = frontImageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -441,7 +442,7 @@ static void wild_mouse_track_25_deg_up_to_flat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -7, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -782,12 +783,12 @@ static void wild_mouse_track_flat_to_60_deg_up(
uint32_t frontImageId = frontImageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 1, 24, 43, height, 29, 4, height + 2);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 2, 43, height, 0, 4, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 1, 24, 43 }, { 29, 4, height + 2 });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 2, 43 }, { 0, 4, height });
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -829,12 +830,12 @@ static void wild_mouse_track_60_deg_up_to_flat(
uint32_t frontImageId = frontImageIds[direction][isChained] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 1, 24, 43, height, 29, 4, height + 2);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 2, 43, height, 0, 4, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 1, 24, 43 }, { 29, 4, height + 2 });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 2, 43 }, { 0, 4, height });
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -882,7 +883,7 @@ static void wild_mouse_track_brakes(
const TrackElement& trackElement)
{
uint32_t imageId = _wild_mouse_brakes_image_ids[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -906,7 +907,7 @@ static void wild_mouse_track_rotation_control_toggle(
};
uint32_t imageId = imageIds[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -924,7 +925,7 @@ static void wild_mouse_track_block_brakes(
{
bool isClosed = trackElement.BlockBrakeClosed();
uint32_t imageId = _wild_mouse_block_brakes_image_ids[direction][isClosed] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);

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

File diff suppressed because it is too large Load Diff

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

@ -157,8 +157,8 @@ static void wooden_wild_mouse_track_station(
};
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height - 2, 0, 2,
height);
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);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -190,7 +190,7 @@ static void wooden_wild_mouse_track_25_deg_up(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[isChained][direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -231,12 +231,12 @@ static void wooden_wild_mouse_track_60_deg_up(
uint32_t imageId = imageIds[isChained][direction] | session.TrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
}
else
{
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, 0, 6, 2, 24, 93, height, 28, 4, height - 16);
session, direction, imageId, { 0, 6, height }, { 2, 24, 93 }, { 28, 4, height - 16 });
}
wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -276,7 +276,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[isChained][direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -318,15 +318,15 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(
if (direction == 0 || direction == 3)
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
}
else
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2);
session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -368,15 +368,15 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(
if (direction == 0 || direction == 3)
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
}
else
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2);
session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -416,7 +416,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[isChained][direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -613,14 +613,14 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(
if (direction == 0 || direction == 3)
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
}
else
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 29 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -663,14 +663,14 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(
if (direction == 0 || direction == 3)
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
}
else
{
imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 33 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);

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

@ -182,7 +182,7 @@ static void paint_ghost_train_track_flat(
{
uint32_t imageId = ghost_train_track_pieces_flat[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
auto tunnelImage = get_tunnel_doors_image_straight_flat(trackElement, direction);
paint_util_push_tunnel_rotated(session, direction, height, tunnelImage);
@ -203,10 +203,10 @@ static void paint_ghost_train_track_25_deg_up(
const TrackElement& trackElement)
{
uint32_t imageId = ghost_train_track_pieces_25_deg_up[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
imageId = ghost_train_track_pieces_25_deg_up[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 23, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 23 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -251,10 +251,10 @@ static void paint_ghost_train_track_flat_to_25_deg_up(
}
uint32_t imageId = ghost_train_track_pieces_flat_to_25_deg_up[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
imageId = ghost_train_track_pieces_flat_to_25_deg_up[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 15, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 15 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -287,10 +287,10 @@ static void paint_ghost_train_track_25_deg_up_to_flat_shared(
const TrackElement& trackElement)
{
uint32_t imageId = ghost_train_track_pieces_25_deg_up_to_flat[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
imageId = ghost_train_track_pieces_25_deg_up_to_flat[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 15, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 15 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -381,7 +381,7 @@ static void paint_ghost_train_station(
};
imageId = imageIds[direction] | session.TrackColours[SCHEME_MISC];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 28, 3, height - 2, 0, 2, height);
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);
@ -497,7 +497,7 @@ static void paint_ghost_train_track_spinning_tunnel(
{
uint32_t imageId = ghost_train_track_pieces_spinning_tunnel_track[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 28, 20, 3, height, 2, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 28, 20, 3 }, { 2, 6, height });
track_paint_util_spinning_tunnel_paint(session, 3, height, direction);
@ -517,7 +517,7 @@ static void paint_ghost_train_track_brakes(
{
uint32_t imageId = ghost_train_track_pieces_brakes[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
auto tunnelImage = get_tunnel_doors_image_straight_flat(trackElement, direction);
paint_util_push_tunnel_rotated(session, direction, height, tunnelImage);

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

@ -644,7 +644,7 @@ static void paint_miniature_railway_track_flat(
if (isSupported)
{
imageId = miniature_railway_track_floor[direction] | session.TrackColours[SCHEME_SUPPORTS];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = miniature_railway_track_pieces_flat[direction] | session.TrackColours[SCHEME_TRACK];
if (!paintAsGravel)
@ -674,24 +674,24 @@ 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, 32, 20, 2, height, 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, 32, 20, 2, height, 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);
PaintAddImageAsParentRotated(session, direction, imageIdAlt, 0, 6, 32, 20, 2, height, 0, 6, height + 2);
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);
PaintAddImageAsParentRotated(
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 });
}
}
@ -711,7 +711,7 @@ static void paint_miniature_railway_station(
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
imageId = miniature_railway_station_floor[direction] | session.TrackColours[SCHEME_MISC];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 28, 2, height - 2, 0, 2, height);
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);
@ -732,7 +732,7 @@ static void paint_miniature_railway_track_25_deg_up(
{
uint32_t imageId = miniature_railway_track_pieces_25_deg_up[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 2 }, { 0, 3, height });
switch (direction)
{
@ -763,7 +763,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(
{
uint32_t imageId = miniature_railway_track_pieces_flat_to_25_deg_up[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 2 }, { 0, 3, height });
switch (direction)
{
@ -794,7 +794,7 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(
{
uint32_t imageId = miniature_railway_track_pieces_25_deg_up_to_flat[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 2, 32, 25, 2, height, 0, 3, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 2 }, { 0, 3, height });
switch (direction)
{
@ -1133,15 +1133,15 @@ 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), 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 });
}
else
{
imageId = miniature_railway_s_bend_left_tiles_track_floor[direction & 1][trackSequence]
| session.TrackColours[SCHEME_SUPPORTS];
PaintAddImageAsParentRotated(
session, direction, imageId, 0, 0, bounds.x, bounds.y, 2, height, offset.x, offset.y, height);
session, direction, imageId, { 0, 0, height }, { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
imageId = miniature_railway_track_pieces_s_bend_left[direction & 1][trackSequence] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsChildRotated(
@ -1240,15 +1240,15 @@ 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), 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 });
}
else
{
imageId = miniature_railway_s_bend_right_tiles_track_floor[direction & 1][trackSequence]
| session.TrackColours[SCHEME_SUPPORTS];
PaintAddImageAsParentRotated(
session, direction, imageId, 0, 0, bounds.x, bounds.y, 2, height, offset.x, offset.y, height);
session, direction, imageId, { 0, 0, height }, { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
imageId = miniature_railway_track_pieces_s_bend_right[direction & 1][trackSequence]
| session.TrackColours[SCHEME_TRACK];

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

File diff suppressed because it is too large Load Diff

140
src/openrct2/ride/water/DingySlide.cpp
View File

@ -369,10 +369,10 @@ static void dinghy_slide_track_flat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -398,8 +398,8 @@ static void dinghy_slide_track_station(
};
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
height + 3);
session, direction, imageIds[direction][0] | session.TrackColours[SCHEME_TRACK], { 0, 0, height }, { 32, 20, 1 },
{ 0, 6, height + 3 });
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height }, { 32, 32, 1 });
@ -437,10 +437,10 @@ static void dinghy_slide_track_25_deg_up(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -473,10 +473,10 @@ static void dinghy_slide_track_60_deg_up(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -518,10 +518,10 @@ static void dinghy_slide_track_flat_to_25_deg_up(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -554,10 +554,10 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -590,10 +590,10 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -635,10 +635,10 @@ static void dinghy_slide_track_25_deg_up_to_flat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
uint32_t imageId = imageIds[isChained][direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[isChained][direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -875,16 +875,18 @@ static void dinghy_slide_track_s_bend_left(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break;
case 1:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
@ -899,8 +901,9 @@ static void dinghy_slide_track_s_bend_left(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
@ -914,8 +917,9 @@ static void dinghy_slide_track_s_bend_left(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -978,16 +982,18 @@ static void dinghy_slide_track_s_bend_right(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break;
case 1:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
@ -1001,8 +1007,9 @@ static void dinghy_slide_track_s_bend_right(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
@ -1015,8 +1022,9 @@ static void dinghy_slide_track_s_bend_right(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1142,10 +1150,10 @@ static void dinghy_slide_track_flat_covered(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1171,10 +1179,10 @@ static void dinghy_slide_track_25_deg_up_covered(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1207,10 +1215,10 @@ static void dinghy_slide_track_60_deg_up_covered(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1243,10 +1251,10 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1279,10 +1287,10 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1315,10 +1323,10 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1351,10 +1359,10 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(
};
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
imageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -1584,16 +1592,18 @@ static void dinghy_slide_track_s_bend_left_covered(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break;
case 1:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
@ -1608,8 +1618,9 @@ static void dinghy_slide_track_s_bend_left_covered(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
@ -1623,8 +1634,9 @@ static void dinghy_slide_track_s_bend_left_covered(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1687,16 +1699,18 @@ static void dinghy_slide_track_s_bend_right_covered(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break;
case 1:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
@ -1710,8 +1724,9 @@ static void dinghy_slide_track_s_bend_right_covered(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
@ -1724,8 +1739,9 @@ static void dinghy_slide_track_s_bend_right_covered(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

78
src/openrct2/ride/water/LogFlume.cpp
View File

@ -167,8 +167,8 @@ static void paint_log_flume_track_flat(
uint32_t imageId = LogFlumeTrackFlatImageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = LogFlumeTrackFlatImageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 26, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -186,7 +186,7 @@ static void paint_log_flume_track_station(
const TrackElement& trackElement)
{
uint32_t imageId = LogFlumeTrackFlatImageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height + 3);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
if (direction & 1)
{
@ -232,8 +232,8 @@ static void paint_log_flume_track_25_deg_up(
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -267,8 +267,8 @@ static void paint_log_flume_track_flat_to_25_deg_up(
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -302,8 +302,8 @@ static void paint_log_flume_track_25_deg_up_to_flat(
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -337,8 +337,8 @@ static void paint_log_flume_track_25_deg_down(
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -372,8 +372,8 @@ static void paint_log_flume_track_flat_to_25_deg_down(
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -407,8 +407,8 @@ static void paint_log_flume_track_25_deg_down_to_flat(
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
@ -466,16 +466,18 @@ static void paint_log_flume_track_s_bend_left(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break;
case 1:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
@ -490,8 +492,9 @@ static void paint_log_flume_track_s_bend_left(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
@ -505,8 +508,9 @@ static void paint_log_flume_track_s_bend_left(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -569,16 +573,18 @@ static void paint_log_flume_track_s_bend_right(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break;
case 1:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
@ -592,8 +598,9 @@ static void paint_log_flume_track_s_bend_right(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
@ -606,8 +613,9 @@ static void paint_log_flume_track_s_bend_right(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(
session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -809,10 +817,10 @@ static void paint_log_flume_track_on_ride_photo(
}
imageId = LogFlumeTrackFlatImageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 0, height, 0, 6, height + 3);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 0 }, { 0, 6, height + 3 });
imageId = LogFlumeTrackFlatImageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 1, 21, height, 0, 27, height + 5);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 21 }, { 0, 27, height + 5 });
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
@ -835,8 +843,8 @@ static void paint_log_flume_track_reverser(
uint32_t imageId = imageIds[direction][0] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = imageIds[direction][1] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 26, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);

76
src/openrct2/ride/water/SplashBoats.cpp
View File

@ -481,8 +481,8 @@ static void paint_splash_boats_track_25_deg_up(
uint32_t imageId = SplashBoats25DegUpImageId[direction] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = SplashBoats25DegUpFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -506,8 +506,8 @@ static void paint_splash_boats_track_60_deg_up(
uint32_t frontImageId = SplashBoats60DegUpFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 98, height, 0, 27, height);
session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -530,8 +530,8 @@ static void paint_splash_boats_track_flat_to_25_deg_up(
uint32_t imageId = SplashBoatsFlatTo25DegUpImageId[direction] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = SplashBoatsFlatTo25DegUpFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -554,8 +554,8 @@ static void paint_splash_boats_track_25_deg_up_to_flat(
uint32_t imageId = SplashBoats25DegUpToFlatImageId[direction] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = SplashBoats25DegUpToFlatFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -579,8 +579,8 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(
uint32_t frontImageId = SplashBoats25DegUpTo60DegUpFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -604,8 +604,8 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(
uint32_t frontImageId = SplashBoats60DegUpTo25DegUpFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -628,8 +628,8 @@ static void paint_splash_boats_track_25_deg_down(
uint32_t imageId = SplashBoats25DegDownImageId[direction] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = SplashBoats25DegDownFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
static constexpr const uint8_t specialSupport[] = { 11, 12, 9, 10 };
wooden_a_supports_paint_setup(
@ -661,8 +661,8 @@ static void paint_splash_boats_track_flat_to_25_deg_down(
uint32_t imageId = SplashBoatsFlatTo25DegDownImageId[direction] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = SplashBoatsFlatTo25DegDownFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
static constexpr const uint8_t specialSupport[] = { 7, 8, 5, 6 };
wooden_a_supports_paint_setup(
@ -701,8 +701,8 @@ static void paint_splash_boats_track_25_deg_down_to_flat(
uint32_t imageId = SplashBoats25DegDownToFlatImageId[direction] | session.TrackColours[SCHEME_TRACK];
uint32_t frontImageId = SplashBoats25DegDownToFlatFrontImageId[direction] | session.TrackColours[SCHEME_TRACK];
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
static constexpr const uint8_t specialSupport[] = { 3, 4, 1, 2 };
wooden_a_supports_paint_setup(
@ -1011,15 +1011,17 @@ static void paint_splash_boats_track_s_bend_left(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
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);
break;
case 1:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1031,8 +1033,9 @@ static void paint_splash_boats_track_s_bend_left(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1043,8 +1046,9 @@ static void paint_splash_boats_track_s_bend_left(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
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);
break;
@ -1109,15 +1113,17 @@ static void paint_splash_boats_track_s_bend_right(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
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);
break;
case 1:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1129,8 +1135,9 @@ static void paint_splash_boats_track_s_bend_right(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1141,8 +1148,9 @@ static void paint_splash_boats_track_s_bend_right(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
PaintAddImageAsParentRotated(session, direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
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);
break;