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

Merge pull request #19390 from Gymnasiast/refactor/p-a-i-a-parent-rotated 

Clean up PaintAddImageAsParentRotated() function and calls
This commit is contained in:
Duncan 2023-02-13 20:29:56 +00:00 committed by GitHub
parent 0383875692 38b057a0ba
commit d8c09e5214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 19230 additions and 19222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,5 +441,5 @@ void JumpingFountain::Paint(PaintSession& session, int32_t imageDirection) const
auto bb = isAntiClockwise ? antiClockWiseBoundingBoxes : clockWiseBoundingBoxes;
PaintAddImageAsParentRotated(
session, imageDirection, imageId, { 0, 0, height }, { 32, 1, 3 }, { bb[imageDirection & 1], height });
session, imageDirection, imageId, { 0, 0, height }, { { bb[imageDirection & 1], height }, { 32, 1, 3 } });
}

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

@ -310,12 +310,17 @@ PaintStruct* PaintAddImageAsChild(
PaintStruct* PaintAddImageAsChildRotated(
PaintSession& session, const uint8_t direction, const ImageId image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset);
PaintStruct* PaintAddImageAsParentRotated(
PaintSession& session, const uint8_t direction, const ImageId image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize);
PaintStruct* PaintAddImageAsParentRotated(
PaintSession& session, const uint8_t direction, const ImageId imageId, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset);
const BoundBoxXYZ& boundBox);
inline PaintStruct* PaintAddImageAsParentRotated(
PaintSession& session, const uint8_t direction, const ImageId imageId, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize)
{
return PaintAddImageAsParentRotated(session, direction, imageId, offset, { offset, boundBoxSize });
}
void PaintUtilPushTunnelRotated(PaintSession& session, uint8_t direction, uint16_t height, uint8_t type);

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

@ -12,30 +12,16 @@
#include "Paint.h"
PaintStruct* PaintAddImageAsParentRotated(
PaintSession& session, const uint8_t direction, const ImageId imageId, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset)
PaintSession& session, const uint8_t direction, const ImageId imageId, const CoordsXYZ& offset, const BoundBoxXYZ& boundBox)
{
if (direction & 1)
{
return PaintAddImageAsParent(
session, imageId, { offset.y, offset.x, offset.z }, { boundBoxSize.y, boundBoxSize.x, boundBoxSize.z },
{ boundBoxOffset.y, boundBoxOffset.x, boundBoxOffset.z });
session, imageId, { offset.y, offset.x, offset.z }, { boundBox.length.y, boundBox.length.x, boundBox.length.z },
{ boundBox.offset.y, boundBox.offset.x, boundBox.offset.z });
}
return PaintAddImageAsParent(session, imageId, offset, boundBoxSize, boundBoxOffset);
}
PaintStruct* PaintAddImageAsParentRotated(
PaintSession& session, const uint8_t direction, const ImageId image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize)
{
if (direction & 1)
{
return PaintAddImageAsParent(
session, image_id, { offset.y, offset.x, offset.z }, { boundBoxSize.y, boundBoxSize.x, boundBoxSize.z });
}
return PaintAddImageAsParent(session, image_id, offset, boundBoxSize);
return PaintAddImageAsParent(session, imageId, offset, boundBox.length, boundBox.offset);
}
PaintStruct* PaintAddImageAsChildRotated(

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

@ -188,7 +188,7 @@ static void AirPoweredVerticalRCTrackFlat(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 1 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -211,7 +211,7 @@ static void AirPoweredVerticalRCTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][1]), { 0, 0, height - 2 },
{ 32, 28, 1 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 1 } });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 20, 1 }, { 0, 6, height });
@ -328,12 +328,12 @@ static void AirPoweredVerticalRCTrackFlatToLeftBank(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (direction == 0 || direction == 1)
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 26 } });
}
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -357,12 +357,12 @@ static void AirPoweredVerticalRCTrackFlatToRightBank(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (direction == 2 || direction == 3)
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 26 } });
}
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -506,11 +506,11 @@ static void AirPoweredVerticalRCTrackLeftBank(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
if (direction == 0 || direction == 1)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 26 } });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
}
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -540,7 +540,7 @@ static void AirPoweredVerticalRCTrackBrakes(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 1 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -658,7 +658,7 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
case 0:
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 20, 32, bbHeight }, { 0, 6, height });
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height }, { 20, 32, bbHeight } });
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 20, 32, bbHeight }, { 0, 6, height });
@ -677,7 +677,7 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
@ -685,7 +685,7 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
@ -705,7 +705,7 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
{
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
@ -713,7 +713,7 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
session, direction, trackImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
@ -741,7 +741,7 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
else
{
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 26, 26, 126 }, { 3, 3, height });
session, direction, supportsImageId, { 0, 0, height }, { { 3, 3, height }, { 26, 26, 126 } });
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence], 0x20);
@ -750,14 +750,14 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
if (isDirection03)
{
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height + 128 }, { 5, 20, 79 } });
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
}
else
{
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
session, direction, trackImageId, { 0, 0, height }, { { 27, 6, height }, { 1, 20, 126 } });
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
}
@ -787,17 +787,19 @@ static void AirPoweredVerticalRCTrackVerticalUp(
{
case 0:
imageId = AirPoweredVerticalRCGetSupportColour(session).WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 26, 26, 79 }, { 3, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 3, 3, height }, { 26, 26, 79 } });
break;
case 1:
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 2, 20, 79 }, { 0, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 2, 20, 79 } });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 2, 20, 79 }, { 30, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 0, height }, { { 30, 6, height }, { 2, 20, 79 } });
}
PaintUtilSetVerticalTunnel(session, height + 80);
@ -845,12 +847,14 @@ static void AirPoweredVerticalRCTrackVerticalTop(
imageIdT = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 32, 20, 15 }, { 0, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdS, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 15 } });
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 31, 20, 15 }, { 1, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdS, { 0, 0, height }, { { 24, 6, height }, { 5, 20, 1 } });
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
}
break;
@ -858,11 +862,13 @@ static void AirPoweredVerticalRCTrackVerticalTop(
imageIdT = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][2]);
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 15 }, { 0, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdT, { 0, 0, height }, { { 0, 6, height }, { 2, 20, 15 } });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 1 }, { 33, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdT, { 0, 0, height }, { { 33, 6, height }, { 2, 20, 1 } });
}
PaintUtilSetVerticalTunnel(session, height + 80);
break;
@ -870,11 +876,13 @@ static void AirPoweredVerticalRCTrackVerticalTop(
imageIdT = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][3]);
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 1 }, { 33, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdT, { 0, 0, height }, { { 33, 6, height }, { 2, 20, 1 } });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdT, { 0, 0, height }, { 2, 20, 15 }, { 0, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdT, { 0, 0, height }, { { 0, 6, height }, { 2, 20, 15 } });
}
PaintUtilSetVerticalTunnel(session, height + 80);
break;
@ -883,12 +891,14 @@ static void AirPoweredVerticalRCTrackVerticalTop(
imageIdT = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][5]);
if (direction == 0)
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdS, { 0, 0, height }, { { 24, 6, height }, { 5, 20, 1 } });
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 5, 20, 1 }, { 24, 6, height });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageIdS, { 0, 0, height }, { 32, 20, 15 }, { 0, 6, height });
PaintAddImageAsParentRotated(
session, direction, imageIdS, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 15 } });
PaintAddImageAsChildRotated(session, direction, imageIdT, { 0, 0, height }, { 32, 20, 15 }, { 0, 6, height });
}
break;
@ -954,7 +964,7 @@ static void AirPoweredVerticalRCTrackOnridePhoto(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 1 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);

1098
src/openrct2/ride/coaster/AlpineCoaster.cpp
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -30,22 +30,22 @@ static void InvertedHairpinRCTrackFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17030), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17031), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17032), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17033), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
}
}
@ -57,13 +57,13 @@ static void InvertedHairpinRCTrackFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17026), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17027), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
}
}
@ -94,10 +94,10 @@ static void InvertedHairpinRCTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 28, 1 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 1 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 3 } });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_SUPPORTS].WithIndex(imageIds[direction][2]), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
@ -120,22 +120,22 @@ static void InvertedHairpinRCTrack25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17070), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17071), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17072), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17073), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
}
}
@ -146,22 +146,22 @@ static void InvertedHairpinRCTrack25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17042), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17043), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17044), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17045), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
}
}
@ -214,22 +214,22 @@ static void InvertedHairpinRCTrack60DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17086), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 88 });
{ { 0, 6, height + 88 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17087), { 0, 0, height + 24 },
{ 32, 2, 81 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 81 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17088), { 0, 0, height + 24 },
{ 32, 2, 81 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 81 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17089), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 88 });
{ { 0, 6, height + 88 }, { 32, 20, 3 } });
break;
}
}
@ -240,22 +240,22 @@ static void InvertedHairpinRCTrack60DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17058), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 88 });
{ { 0, 6, height + 88 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17059), { 0, 0, height + 24 },
{ 32, 2, 81 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 81 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17060), { 0, 0, height + 24 },
{ 32, 2, 81 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 81 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17061), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 88 });
{ { 0, 6, height + 88 }, { 32, 20, 3 } });
break;
}
}
@ -284,22 +284,22 @@ static void InvertedHairpinRCTrackFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17062), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17063), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17064), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17065), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
}
@ -310,22 +310,22 @@ static void InvertedHairpinRCTrackFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17034), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17035), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17036), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17037), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
}
@ -378,28 +378,28 @@ static void InvertedHairpinRCTrack25DegUpTo60DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17074), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17078), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17075), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17079), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17076), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17077), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
}
}
@ -410,28 +410,28 @@ static void InvertedHairpinRCTrack25DegUpTo60DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17046), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17050), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17047), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17051), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17048), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17049), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
}
}
@ -460,28 +460,28 @@ static void InvertedHairpinRCTrack60DegUpTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17080), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17084), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17081), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17085), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17082), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17083), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
}
}
@ -492,28 +492,28 @@ static void InvertedHairpinRCTrack60DegUpTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17052), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17056), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17053), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17057), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17054), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17055), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 32, 20, 3 } });
break;
}
}
@ -566,22 +566,22 @@ static void InvertedHairpinRCTrack25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17066), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17067), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17068), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17069), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
}
@ -592,22 +592,22 @@ static void InvertedHairpinRCTrack25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17038), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17039), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17040), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17041), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
}
@ -709,22 +709,22 @@ static void InvertedHairpinRCTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17123), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17126), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17129), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17120), { 0, 0, height + 24 },
{ 32, 20, 3 }, { 0, 6, height + 22 });
{ { 0, 6, height + 22 }, { 32, 20, 3 } });
break;
}
@ -749,22 +749,22 @@ static void InvertedHairpinRCTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17122), { 0, 0, height + 24 },
{ 16, 16, 3 }, { 16, 0, height + 22 });
{ { 16, 0, height + 22 }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17125), { 0, 0, height + 24 },
{ 16, 16, 3 }, { 0, 0, height + 22 });
{ { 0, 0, height + 22 }, { 16, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17128), { 0, 0, height + 24 },
{ 16, 16, 3 }, { 0, 16, height + 22 });
{ { 0, 16, height + 22 }, { 16, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17119), { 0, 0, height + 24 },
{ 16, 16, 3 }, { 16, 16, height + 22 });
{ { 16, 16, height + 22 }, { 16, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -777,22 +777,22 @@ static void InvertedHairpinRCTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17121), { 0, 0, height + 24 },
{ 20, 32, 3 }, { 6, 0, height + 22 });
{ { 6, 0, height + 22 }, { 20, 32, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17124), { 0, 0, height + 24 },
{ 20, 32, 3 }, { 6, 0, height + 22 });
{ { 6, 0, height + 22 }, { 20, 32, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17127), { 0, 0, height + 24 },
{ 20, 32, 3 }, { 6, 0, height + 22 });
{ { 6, 0, height + 22 }, { 20, 32, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17118), { 0, 0, height + 24 },
{ 20, 32, 3 }, { 6, 0, height + 22 });
{ { 6, 0, height + 22 }, { 20, 32, 3 } });
break;
}
@ -1042,23 +1042,23 @@ static void InvertedHairpinRCTrackLeftQuarterTurn1(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17114), { 0, 0, height + 24 }, { 26, 24, 3 },
{ 6, 2, height + 24 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17114), { 0, 0, height + 24 },
{ { 6, 2, height + 24 }, { 26, 24, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17115), { 0, 0, height + 24 }, { 26, 26, 3 },
{ 0, 0, height + 24 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17115), { 0, 0, height + 24 },
{ { 0, 0, height + 24 }, { 26, 26, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17116), { 0, 0, height + 24 }, { 24, 26, 3 },
{ 2, 6, height + 24 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17116), { 0, 0, height + 24 },
{ { 2, 6, height + 24 }, { 24, 26, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17117), { 0, 0, height + 24 }, { 24, 24, 3 },
{ 6, 6, height + 24 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17117), { 0, 0, height + 24 },
{ { 6, 6, height + 24 }, { 24, 24, 3 } });
break;
}
@ -1102,28 +1102,28 @@ static void InvertedHairpinRCTrackFlatTo60DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17102), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 30, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17106), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17103), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17107), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17104), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17105), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 30, 20, 3 } });
break;
}
}
@ -1134,28 +1134,28 @@ static void InvertedHairpinRCTrackFlatTo60DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17090), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 30, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17094), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17091), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17095), { 0, 0, height + 24 },
{ 32, 10, 49 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17092), { 0, 0, height + 24 },
{ 32, 2, 49 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17093), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 56 });
{ { 0, 6, height + 56 }, { 30, 20, 3 } });
break;
}
}
@ -1184,28 +1184,28 @@ static void InvertedHairpinRCTrack60DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17108), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 48 });
{ { 0, 6, height + 48 }, { 30, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17112), { 0, 0, height + 24 },
{ 32, 10, 41 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 41 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17109), { 0, 0, height + 24 },
{ 32, 2, 41 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 41 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17113), { 0, 0, height + 24 },
{ 32, 10, 41 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 41 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17110), { 0, 0, height + 24 },
{ 32, 2, 41 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 41 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17111), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 48 });
{ { 0, 6, height + 48 }, { 30, 20, 3 } });
break;
}
}
@ -1216,28 +1216,28 @@ static void InvertedHairpinRCTrack60DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17096), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 48 });
{ { 0, 6, height + 48 }, { 30, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17100), { 0, 0, height + 24 },
{ 32, 10, 41 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 41 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17097), { 0, 0, height + 24 },
{ 32, 2, 41 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 41 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17101), { 0, 0, height + 24 },
{ 32, 10, 41 }, { 0, 10, height + 6 });
{ { 0, 10, height + 6 }, { 32, 10, 41 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17098), { 0, 0, height + 24 },
{ 32, 2, 41 }, { 0, 4, height + 6 });
{ { 0, 4, height + 6 }, { 32, 2, 41 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17099), { 0, 0, height + 24 },
{ 30, 20, 3 }, { 0, 6, height + 48 });
{ { 0, 6, height + 48 }, { 30, 20, 3 } });
break;
}
}
@ -1301,14 +1301,14 @@ static void InvertedHairpinRCTrackBrakes(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17028), { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17028), { 0, 0, height + 24 },
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17029), { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17029), { 0, 0, height + 24 },
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
}
@ -1334,14 +1334,14 @@ static void InvertedHairpinRCTrackBlockBrakes(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17028), { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17028), { 0, 0, height + 24 },
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17029), { 0, 0, height + 24 }, { 32, 20, 1 },
{ 0, 6, height + 22 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(17029), { 0, 0, height + 24 },
{ { 0, 6, height + 22 }, { 32, 20, 1 } });
break;
}

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

@ -28,14 +28,14 @@ static void InvertedImpulseRCTrackFlat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19662), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19662), { 0, 0, height + 29 },
{ { 0, 6, height + 29 }, { 32, 20, 3 } });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19663), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 29 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19663), { 0, 0, height + 29 },
{ { 0, 6, height + 29 }, { 32, 20, 3 } });
break;
}
@ -65,10 +65,10 @@ static void InvertedImpulseRCTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 28, 1 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 1 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 29 });
{ { 0, 6, height + 29 }, { 32, 20, 3 } });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_SUPPORTS].WithIndex(imageIds[direction][2]), { 0, 6, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 29 });
@ -88,23 +88,23 @@ static void InvertedImpulseRCTrack25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19672), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19672), { 0, 0, height + 29 },
{ { 0, 6, height + 45 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19673), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19673), { 0, 0, height + 29 },
{ { 0, 6, height + 45 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19674), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19674), { 0, 0, height + 29 },
{ { 0, 6, height + 45 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19675), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 45 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19675), { 0, 0, height + 29 },
{ { 0, 6, height + 45 }, { 32, 20, 3 } });
break;
}
@ -153,23 +153,23 @@ static void InvertedImpulseRCTrack60DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19688), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 93 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19688), { 0, 0, height + 29 },
{ { 0, 6, height + 93 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19689), { 0, 0, height + 29 }, { 32, 2, 81 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19689), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 81 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19690), { 0, 0, height + 29 }, { 32, 2, 81 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19690), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 81 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19691), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 93 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19691), { 0, 0, height + 29 },
{ { 0, 6, height + 93 }, { 32, 20, 3 } });
break;
}
if (direction == 0 || direction == 3)
@ -194,23 +194,23 @@ static void InvertedImpulseRCTrackFlatTo25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19664), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19664), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19665), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19665), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19666), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19666), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19667), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19667), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
}
@ -256,29 +256,29 @@ static void InvertedImpulseRCTrack25DegUpTo60DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19676), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19676), { 0, 0, height + 29 },
{ { 0, 6, height + 61 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19680), { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19680), { 0, 0, height + 29 },
{ { 0, 10, height + 11 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19677), { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19677), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19681), { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19681), { 0, 0, height + 29 },
{ { 0, 10, height + 11 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19678), { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19678), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19679), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19679), { 0, 0, height + 29 },
{ { 0, 6, height + 61 }, { 32, 20, 3 } });
break;
}
if (direction == 0 || direction == 3)
@ -303,29 +303,29 @@ static void InvertedImpulseRCTrack60DegUpTo25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19682), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19682), { 0, 0, height + 29 },
{ { 0, 6, height + 61 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19686), { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19686), { 0, 0, height + 29 },
{ { 0, 10, height + 11 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19683), { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19683), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 49 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19687), { 0, 0, height + 29 }, { 32, 10, 49 },
{ 0, 10, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19687), { 0, 0, height + 29 },
{ { 0, 10, height + 11 }, { 32, 10, 49 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19684), { 0, 0, height + 29 }, { 32, 2, 49 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19684), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 49 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19685), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 61 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19685), { 0, 0, height + 29 },
{ { 0, 6, height + 61 }, { 32, 20, 3 } });
break;
}
if (direction == 0 || direction == 3)
@ -350,23 +350,23 @@ static void InvertedImpulseRCTrack25DegUpToFlat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19668), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19668), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19669), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19669), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19670), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19670), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19671), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 37 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19671), { 0, 0, height + 29 },
{ { 0, 6, height + 37 }, { 32, 20, 3 } });
break;
}
@ -464,22 +464,22 @@ static void InvertedImpulseRCTrack90DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19700), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 61 });
{ { 0, 6, height + 61 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19701), { 0, 0, height + 29 },
{ 32, 2, 31 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 31 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19702), { 0, 0, height + 29 },
{ 32, 2, 31 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 31 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19703), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 61 });
{ { 0, 6, height + 61 }, { 32, 20, 3 } });
break;
}
PaintUtilSetVerticalTunnel(session, height + 32);
@ -513,22 +513,22 @@ static void InvertedImpulseRCTrack60DegUpTo90DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19692), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 85 });
{ { 0, 6, height + 85 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19693), { 0, 0, height + 29 },
{ 32, 2, 55 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 55 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19694), { 0, 0, height + 29 },
{ 32, 2, 55 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 55 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19695), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 85 });
{ { 0, 6, height + 85 }, { 32, 20, 3 } });
break;
}
if (direction == 0 || direction == 3)
@ -562,23 +562,23 @@ static void InvertedImpulseRCTrack90DegUpTo60DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19696), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19696), { 0, 0, height + 29 },
{ { 0, 6, height + 85 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19697), { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19697), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 55 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19698), { 0, 0, height + 29 }, { 32, 2, 55 },
{ 0, 4, height + 11 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19698), { 0, 0, height + 29 },
{ { 0, 4, height + 11 }, { 32, 2, 55 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19699), { 0, 0, height + 29 }, { 32, 20, 3 },
{ 0, 6, height + 85 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19699), { 0, 0, height + 29 },
{ { 0, 6, height + 85 }, { 32, 20, 3 } });
break;
}
switch (direction)
@ -608,22 +608,22 @@ static void InvertedImpulseRCTrack60DegDownTo90DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19698), { 0, 0, height + 29 },
{ 32, 2, 55 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 55 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19699), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 85 });
{ { 0, 6, height + 85 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19696), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 85 });
{ { 0, 6, height + 85 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19697), { 0, 0, height + 29 },
{ 32, 2, 55 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 55 } });
break;
}
if (direction == 0 || direction == 3)
@ -652,31 +652,31 @@ static void InvertedImpulseRCTrackLeftQuarterTurn190DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19708), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19709), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19717), { 0, 0, height + 29 },
{ 2, 32, 31 }, { 4, 0, height + 11 });
{ { 4, 0, height + 11 }, { 2, 32, 31 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19710), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19718), { 0, 0, height + 29 },
{ 32, 2, 31 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 31 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19711), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19719), { 0, 0, height + 29 },
{ 32, 2, 31 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 31 } });
break;
}
PaintUtilSetVerticalTunnel(session, height + 96);
@ -702,31 +702,31 @@ static void InvertedImpulseRCTrackRightQuarterTurn190DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19704), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19712), { 0, 0, height + 29 },
{ 32, 2, 31 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 31 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19705), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19713), { 0, 0, height + 29 },
{ 32, 2, 31 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 31 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19706), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19714), { 0, 0, height + 29 },
{ 32, 2, 31 }, { 0, 4, height + 11 });
{ { 0, 4, height + 11 }, { 32, 2, 31 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(19707), { 0, 0, height + 29 },
{ 32, 20, 3 }, { 0, 6, height + 125 });
{ { 0, 6, height + 125 }, { 32, 20, 3 } });
break;
}
PaintUtilSetVerticalTunnel(session, height + 96);

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

File diff suppressed because it is too large Load Diff

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

@ -5848,7 +5848,8 @@ static void JuniorRCTrackOnRidePhoto(
session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 8, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 6, height }, { { 0, 6, height + 3 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
@ -5858,7 +5859,8 @@ static void JuniorRCTrackOnRidePhoto(
session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 7, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 6, height }, { { 0, 6, height + 3 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
@ -5868,7 +5870,8 @@ static void JuniorRCTrackOnRidePhoto(
session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 8, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 6, height }, { { 0, 6, height + 3 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
@ -5878,7 +5881,8 @@ static void JuniorRCTrackOnRidePhoto(
session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 7, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 6, height }, { { 0, 6, height + 3 }, { 32, 20, 1 } });
break;
}
TrackPaintUtilOnridePhotoPaint(session, direction, height + 3 + photoCameraOffset, trackElement);

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -97,7 +97,7 @@ static void MiniSuspendedRCTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 28, 1 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 1 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]), { 0, 6, height + 24 },
{ 32, 20, 1 });
@ -123,22 +123,22 @@ static void MiniSuspendedRCTrack25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28435), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28441), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28437), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28442), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
}
}
@ -149,22 +149,22 @@ static void MiniSuspendedRCTrack25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28385), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28391), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28387), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28392), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 40 });
{ { 0, 6, height + 40 }, { 32, 20, 1 } });
break;
}
}
@ -217,22 +217,22 @@ static void MiniSuspendedRCTrackFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28436), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28443), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28438), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28444), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
}
}
@ -243,22 +243,22 @@ static void MiniSuspendedRCTrackFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28386), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28393), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28388), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28394), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
}
}
@ -311,22 +311,22 @@ static void MiniSuspendedRCTrack25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28440), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28446), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28439), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28445), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
}
}
@ -337,22 +337,22 @@ static void MiniSuspendedRCTrack25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28390), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28396), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28389), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28395), { 0, 6, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 1 } });
break;
}
}
@ -1185,22 +1185,22 @@ static void MiniSuspendedRCTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28475), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28479), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28483), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28487), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
}
@ -1232,22 +1232,22 @@ static void MiniSuspendedRCTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28476), { 0, 0, height + 24 },
{ 32, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 32, 16, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28480), { 0, 0, height + 24 },
{ 34, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 34, 16, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28484), { 0, 0, height + 24 },
{ 32, 16, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 32, 16, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28488), { 0, 0, height + 24 },
{ 32, 16, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 32, 16, 1 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1262,22 +1262,22 @@ static void MiniSuspendedRCTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28477), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 16, 16, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28481), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 16, 16, height + 24 });
{ { 16, 16, height + 24 }, { 16, 16, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28485), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 16, 0, height + 24 });
{ { 16, 0, height + 24 }, { 16, 16, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28489), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 16, 16, 1 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1296,22 +1296,22 @@ static void MiniSuspendedRCTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28478), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 16, 16, height + 24 });
{ { 16, 16, height + 24 }, { 16, 16, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28482), { 0, 0, height + 24 },
{ 16, 18, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 16, 18, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28486), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 16, 16, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28490), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 16, 0, height + 24 });
{ { 16, 0, height + 24 }, { 16, 16, 1 } });
break;
}
@ -1358,22 +1358,22 @@ static void MiniSuspendedRCTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28459), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28463), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28467), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28471), { 0, 0, height + 24 },
{ 32, 20, 1 }, { 0, 6, height + 24 });
{ { 0, 6, height + 24 }, { 32, 20, 1 } });
break;
}
@ -1405,22 +1405,22 @@ static void MiniSuspendedRCTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28460), { 0, 0, height + 24 },
{ 32, 16, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 32, 16, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28464), { 0, 0, height + 24 },
{ 32, 16, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 32, 16, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28468), { 0, 0, height + 24 },
{ 34, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 34, 16, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28472), { 0, 0, height + 24 },
{ 32, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 32, 16, 1 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1435,22 +1435,22 @@ static void MiniSuspendedRCTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28461), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 16, 16, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28465), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 16, 0, height + 24 });
{ { 16, 0, height + 24 }, { 16, 16, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28469), { 0, 0, height + 24 },
{ 28, 28, 1 }, { 4, 2, height + 24 });
{ { 4, 2, height + 24 }, { 28, 28, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28473), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 16, 16, 1 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1469,22 +1469,22 @@ static void MiniSuspendedRCTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28462), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 16, 0, height + 24 });
{ { 16, 0, height + 24 }, { 16, 16, 1 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28466), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 0, 0, height + 24 });
{ { 0, 0, height + 24 }, { 16, 16, 1 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28470), { 0, 0, height + 24 },
{ 16, 18, 1 }, { 0, 16, height + 24 });
{ { 0, 16, height + 24 }, { 16, 18, 1 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28474), { 0, 0, height + 24 },
{ 16, 16, 1 }, { 16, 16, height + 24 });
{ { 16, 16, height + 24 }, { 16, 16, 1 } });
break;
}
@ -1551,7 +1551,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28510), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1562,7 +1562,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28494), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1578,7 +1578,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28507), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1589,7 +1589,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28491), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1605,7 +1605,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28509), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1616,7 +1616,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28493), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1632,7 +1632,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28508), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1643,7 +1643,7 @@ static void MiniSuspendedRCTrackDiagFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28492), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 24 });
{ { -16, -16, height + 24 }, { 32, 32, 1 } });
break;
}
}
@ -1690,7 +1690,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28522), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1701,7 +1701,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28506), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1717,7 +1717,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28519), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1728,7 +1728,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28503), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1744,7 +1744,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28521), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1755,7 +1755,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28505), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1771,7 +1771,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28520), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1782,7 +1782,7 @@ static void MiniSuspendedRCTrackDiag25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28504), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -1829,7 +1829,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28514), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1840,7 +1840,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28498), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1856,7 +1856,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28511), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1867,7 +1867,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28495), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1883,7 +1883,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28513), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1894,7 +1894,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28497), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1910,7 +1910,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28512), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1921,7 +1921,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28496), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1968,7 +1968,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28518), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1979,7 +1979,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28502), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -1995,7 +1995,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28515), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2006,7 +2006,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28499), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2022,7 +2022,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28517), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2033,7 +2033,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28501), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2049,7 +2049,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28516), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2060,7 +2060,7 @@ static void MiniSuspendedRCTrackDiag25DegUpToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28500), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2107,7 +2107,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28520), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2118,7 +2118,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28504), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2134,7 +2134,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28521), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2145,7 +2145,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28505), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2161,7 +2161,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28519), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2172,7 +2172,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28503), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2188,7 +2188,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28522), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2199,7 +2199,7 @@ static void MiniSuspendedRCTrackDiag25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28506), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 1 } });
break;
}
}
@ -2246,7 +2246,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28516), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2257,7 +2257,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28500), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2272,7 +2272,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28517), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2283,7 +2283,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28501), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2298,7 +2298,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28515), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2309,7 +2309,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28499), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2324,7 +2324,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28518), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2335,7 +2335,7 @@ static void MiniSuspendedRCTrackDiagFlatTo25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28502), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2382,7 +2382,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28512), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2393,7 +2393,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28496), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2409,7 +2409,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28513), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2420,7 +2420,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28497), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2436,7 +2436,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28511), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2447,7 +2447,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28495), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2463,7 +2463,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28514), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}
@ -2474,7 +2474,7 @@ static void MiniSuspendedRCTrackDiag25DegDownToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28498), { -16, -16, height + 24 },
{ 32, 32, 1 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 1 } });
break;
}
}

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

File diff suppressed because it is too large Load Diff

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

@ -282,7 +282,7 @@ static void PaintReverseFreefallRCSlope(
{
bbHeight = bbHeights03[trackSequence];
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
@ -300,7 +300,7 @@ static void PaintReverseFreefallRCSlope(
{
bbHeight = bbHeights12[trackSequence];
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
session, direction, trackImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
@ -329,8 +329,8 @@ static void PaintReverseFreefallRCSlope(
else
{
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { isDirection03 ? 26 : 18, 26, 126 },
{ isDirection03 ? 3 : 11, 3, height });
session, direction, supportsImageId, { 0, 0, height },
{ { isDirection03 ? 3 : 11, 3, height }, { isDirection03 ? 26 : 18, 26, 126 } });
}
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence], 0x20);
@ -339,14 +339,14 @@ static void PaintReverseFreefallRCSlope(
if (isDirection03)
{
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height + 128 }, { 5, 20, 79 } });
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 5, 20, 79 }, { 0, 6, height + 128 });
}
else
{
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
session, direction, trackImageId, { 0, 0, height }, { { 27, 6, height }, { 1, 20, 126 } });
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
}
@ -376,12 +376,12 @@ static void PaintReverseFreefallRCVertical(
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 2, 20, 79 }, { 0, 6, height });
session, direction, trackImageId, { 0, 0, height }, { { 0, 6, height }, { 2, 20, 79 } });
}
else
{
PaintAddImageAsParentRotated(
session, direction, trackImageId, { 0, 0, height }, { 2, 20, 79 }, { 30, 6, height });
session, direction, trackImageId, { 0, 0, height }, { { 30, 6, height }, { 2, 20, 79 } });
}
PaintUtilSetVerticalTunnel(session, height + 80);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -410,7 +410,7 @@ static void PaintReverseFreefallRCOnridePhoto(
}
PaintAddImageAsParentRotated(
session, direction, colour.WithIndex(imageIds[direction]), { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
session, direction, colour.WithIndex(imageIds[direction]), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 1 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);

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

@ -57,15 +57,15 @@ static void ReverserRCTrackFlat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21520), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21520), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21521), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21521), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -77,15 +77,15 @@ static void ReverserRCTrackFlat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21504), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21504), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21505), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21505), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -108,7 +108,7 @@ static void ReverserRCTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][1]), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
@ -130,26 +130,26 @@ static void ReverserRCTrack25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21530), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21530), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21531), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21531), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21532), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21532), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21533), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21533), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -160,26 +160,26 @@ static void ReverserRCTrack25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21516), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21516), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21517), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21517), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21518), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21518), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21519), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21519), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -207,26 +207,26 @@ static void ReverserRCTrackFlatTo25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21522), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21522), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21523), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21523), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21524), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21524), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21525), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21525), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -237,26 +237,26 @@ static void ReverserRCTrackFlatTo25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21508), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21508), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21509), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21509), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21510), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21510), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21511), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21511), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -284,26 +284,26 @@ static void ReverserRCTrack25DegUpToFlat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21526), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21526), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21527), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21527), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21528), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21528), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21529), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21529), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -314,26 +314,26 @@ static void ReverserRCTrack25DegUpToFlat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21512), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21512), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21513), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21513), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21514), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21514), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21515), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21515), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -595,25 +595,25 @@ static void ReverserRCTrackSBendLeft(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21566), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21570), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21569), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21573), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -630,25 +630,25 @@ static void ReverserRCTrackSBendLeft(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21567), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21571), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21568), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21572), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -664,25 +664,25 @@ static void ReverserRCTrackSBendLeft(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21568), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21572), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21567), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21571), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -698,25 +698,25 @@ static void ReverserRCTrackSBendLeft(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21569), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21573), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21566), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21570), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -748,25 +748,25 @@ static void ReverserRCTrackSBendRight(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21574), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21578), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21577), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21581), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -783,25 +783,25 @@ static void ReverserRCTrackSBendRight(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21575), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21579), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21576), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21580), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -817,25 +817,25 @@ static void ReverserRCTrackSBendRight(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21576), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21580), { 0, 0, height },
{ 32, 26, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21575), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21579), { 0, 0, height },
{ 32, 26, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 26, 2 } });
WoodenASupportsPaintSetup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -851,25 +851,25 @@ static void ReverserRCTrackSBendRight(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21577), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21581), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21574), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21578), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -901,25 +901,25 @@ static void ReverserRCTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21559), { 0, 0, height },
{ 32, 20, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 2 } });
WoodenASupportsPaintSetup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21562), { 0, 0, height },
{ 32, 20, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 2 } });
WoodenASupportsPaintSetup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21565), { 0, 0, height },
{ 32, 20, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 2 } });
WoodenASupportsPaintSetup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21556), { 0, 0, height },
{ 32, 20, 2 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 2 } });
WoodenASupportsPaintSetup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -939,22 +939,22 @@ static void ReverserRCTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21558), { 0, 0, height },
{ 16, 16, 2 }, { 16, 0, height });
{ { 16, 0, height }, { 16, 16, 2 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21561), { 0, 0, height },
{ 16, 16, 2 }, { 0, 0, height });
{ { 0, 0, height }, { 16, 16, 2 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21564), { 0, 0, height },
{ 16, 16, 2 }, { 0, 16, height });
{ { 0, 16, height }, { 16, 16, 2 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21555), { 0, 0, height },
{ 16, 16, 2 }, { 16, 16, height });
{ { 16, 16, height }, { 16, 16, 2 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -967,25 +967,25 @@ static void ReverserRCTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21557), { 0, 0, height },
{ 20, 32, 2 }, { 6, 0, height });
{ { 6, 0, height }, { 20, 32, 2 } });
WoodenASupportsPaintSetup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21560), { 0, 0, height },
{ 20, 32, 2 }, { 6, 0, height });
{ { 6, 0, height }, { 20, 32, 2 } });
WoodenASupportsPaintSetup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21563), { 0, 0, height },
{ 20, 32, 2 }, { 6, 0, height });
{ { 6, 0, height }, { 20, 32, 2 } });
WoodenASupportsPaintSetup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21554), { 0, 0, height },
{ 20, 32, 2 }, { 6, 0, height });
{ { 6, 0, height }, { 20, 32, 2 } });
WoodenASupportsPaintSetup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1023,15 +1023,15 @@ static void ReverserRCTrackBrakes(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21506), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21506), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21507), { 0, 0, height }, { 32, 27, 2 },
{ 0, 2, height });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21507), { 0, 0, height },
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1053,25 +1053,25 @@ static void ReverserRCTrackLeftReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21582), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21588), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21594), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21600), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1088,25 +1088,25 @@ static void ReverserRCTrackLeftReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21585), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21591), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21597), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21603), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1119,25 +1119,25 @@ static void ReverserRCTrackLeftReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21586), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21592), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21598), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21604), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1150,25 +1150,25 @@ static void ReverserRCTrackLeftReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21587), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21593), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21599), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21605), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1181,25 +1181,25 @@ static void ReverserRCTrackLeftReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21583), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21589), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21595), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21601), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1212,25 +1212,25 @@ static void ReverserRCTrackLeftReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21584), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21590), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21596), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21602), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1262,25 +1262,25 @@ static void ReverserRCTrackRightReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21596), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21602), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21584), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21590), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1297,25 +1297,25 @@ static void ReverserRCTrackRightReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21599), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21605), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21587), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21593), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1328,25 +1328,25 @@ static void ReverserRCTrackRightReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21598), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21604), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21586), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21592), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1359,25 +1359,25 @@ static void ReverserRCTrackRightReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21597), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21603), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21585), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21591), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1390,25 +1390,25 @@ static void ReverserRCTrackRightReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21595), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21601), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21583), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21589), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1421,25 +1421,25 @@ static void ReverserRCTrackRightReverser(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21594), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21600), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21582), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(21588), { 0, 0, height },
{ 32, 27, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 27, 2 } });
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -80,7 +80,7 @@ static void SteeplechaseTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][1]), { 0, 0, height - 2 },
{ 32, 28, 3 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 3 } });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]), { 0, 6, height },
{ 32, 20, 3 }, { 0, 0, height });
@ -1035,28 +1035,28 @@ static void SteeplechaseTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28725), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28729), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28733), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28737), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1075,22 +1075,22 @@ static void SteeplechaseTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28726), { 0, 0, height },
{ 32, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28730), { 0, 0, height },
{ 34, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 34, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28734), { 0, 0, height },
{ 32, 16, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 32, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28738), { 0, 0, height },
{ 32, 16, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 32, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1105,22 +1105,22 @@ static void SteeplechaseTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28727), { 0, 0, height },
{ 16, 16, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28731), { 0, 0, height },
{ 16, 16, 3 }, { 16, 16, height });
{ { 16, 16, height }, { 16, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28735), { 0, 0, height },
{ 16, 16, 3 }, { 16, 0, height });
{ { 16, 0, height }, { 16, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28739), { 0, 0, height },
{ 16, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 16, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1139,28 +1139,28 @@ static void SteeplechaseTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28728), { 0, 0, height },
{ 16, 16, 3 }, { 16, 16, height });
{ { 16, 16, height }, { 16, 16, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28732), { 0, 0, height },
{ 16, 18, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 16, 18, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28736), { 0, 0, height },
{ 16, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 16, 16, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28740), { 0, 0, height },
{ 16, 16, 3 }, { 16, 0, height });
{ { 16, 0, height }, { 16, 16, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1187,28 +1187,28 @@ static void SteeplechaseTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28709), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28713), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28717), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28721), { 0, 0, height },
{ 32, 20, 3 }, { 0, 6, height });
{ { 0, 6, height }, { 32, 20, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1227,22 +1227,22 @@ static void SteeplechaseTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28710), { 0, 0, height },
{ 32, 16, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 32, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28714), { 0, 0, height },
{ 32, 16, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 32, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28718), { 0, 0, height },
{ 34, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 34, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28722), { 0, 0, height },
{ 32, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 32, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1257,22 +1257,22 @@ static void SteeplechaseTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28711), { 0, 0, height },
{ 16, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28715), { 0, 0, height },
{ 16, 16, 3 }, { 16, 0, height });
{ { 16, 0, height }, { 16, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28719), { 0, 0, height },
{ 28, 28, 3 }, { 4, 4, height });
{ { 4, 4, height }, { 28, 28, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28723), { 0, 0, height },
{ 16, 16, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 16, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1291,28 +1291,28 @@ static void SteeplechaseTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28712), { 0, 0, height },
{ 16, 16, 3 }, { 16, 0, height });
{ { 16, 0, height }, { 16, 16, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28716), { 0, 0, height },
{ 16, 16, 3 }, { 0, 0, height });
{ { 0, 0, height }, { 16, 16, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28720), { 0, 0, height },
{ 16, 18, 3 }, { 0, 16, height });
{ { 0, 16, height }, { 16, 18, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28724), { 0, 0, height },
{ 16, 16, 3 }, { 16, 16, height });
{ { 16, 16, height }, { 16, 16, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1359,7 +1359,7 @@ static void SteeplechaseTrackDiagFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28760), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1370,7 +1370,7 @@ static void SteeplechaseTrackDiagFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28744), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1386,7 +1386,7 @@ static void SteeplechaseTrackDiagFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28757), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1397,7 +1397,7 @@ static void SteeplechaseTrackDiagFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28741), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1413,7 +1413,7 @@ static void SteeplechaseTrackDiagFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28759), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1424,7 +1424,7 @@ static void SteeplechaseTrackDiagFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28743), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1444,7 +1444,7 @@ static void SteeplechaseTrackDiagFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28758), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1469,7 +1469,7 @@ static void SteeplechaseTrackDiagFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28742), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1505,7 +1505,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28772), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1516,7 +1516,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28756), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1532,7 +1532,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28769), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1543,7 +1543,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28753), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1559,7 +1559,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28771), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1570,7 +1570,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28755), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1590,7 +1590,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28770), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1615,7 +1615,7 @@ static void SteeplechaseTrackDiag25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28754), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1651,7 +1651,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28764), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1662,7 +1662,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28748), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1678,7 +1678,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28761), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1689,7 +1689,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28745), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1705,7 +1705,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28763), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1716,7 +1716,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28747), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1736,7 +1736,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28762), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1761,7 +1761,7 @@ static void SteeplechaseTrackDiagFlatTo25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28746), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1797,7 +1797,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28768), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1808,7 +1808,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28752), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1824,7 +1824,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28765), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1835,7 +1835,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28749), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1851,7 +1851,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28767), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1862,7 +1862,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28751), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1882,7 +1882,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28766), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1907,7 +1907,7 @@ static void SteeplechaseTrackDiag25DegUpToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28750), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -1943,7 +1943,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28770), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1954,7 +1954,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28754), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1970,7 +1970,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28771), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1981,7 +1981,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28755), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -1997,7 +1997,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28769), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2008,7 +2008,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28753), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2028,7 +2028,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28772), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2053,7 +2053,7 @@ static void SteeplechaseTrackDiag25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28756), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2089,7 +2089,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28766), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2100,7 +2100,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28750), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2115,7 +2115,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28767), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2126,7 +2126,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28751), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2141,7 +2141,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28765), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2152,7 +2152,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28749), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2171,7 +2171,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28768), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2196,7 +2196,7 @@ static void SteeplechaseTrackDiagFlatTo25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28752), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2233,7 +2233,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28762), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2244,7 +2244,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28746), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2260,7 +2260,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28763), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2271,7 +2271,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28747), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2287,7 +2287,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28761), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2298,7 +2298,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28745), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
break;
}
}
@ -2318,7 +2318,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28764), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2343,7 +2343,7 @@ static void SteeplechaseTrackDiag25DegDownToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(28748), { -16, -16, height },
{ 32, 32, 3 }, { -16, -16, height });
{ { -16, -16, height }, { 32, 32, 3 } });
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;

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

File diff suppressed because it is too large Load Diff

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

@ -177,7 +177,7 @@ static void WildMouseTrackFlat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][isChained]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -202,7 +202,7 @@ static void WildMouseTrackStation(
int32_t trackType = trackElement.GetTrackType();
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(baseImageIds[direction]), { 0, 0, height - 2 },
{ 32, 28, 2 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 2 } });
if (trackType == TrackElemType::EndStation)
{
bool isClosed = trackElement.IsBrakeClosed();
@ -238,7 +238,7 @@ static void WildMouseTrack25DegUp(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][isChained]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -272,11 +272,11 @@ static void WildMouseTrack60DegUp(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][isChained]);
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
}
else
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 98 } });
}
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -316,7 +316,7 @@ static void WildMouseTrackFlatTo25DegUp(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][isChained]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -4, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -357,12 +357,12 @@ static void WildMouseTrack25DegUpTo60DegUp(
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(frontImageIds[direction][isChained]);
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
}
else
{
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
}
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -404,12 +404,12 @@ static void WildMouseTrack60DegUpTo25DegUp(
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(frontImageIds[direction][isChained]);
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
}
else
{
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
}
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -442,7 +442,7 @@ static void WildMouseTrack25DegUpToFlat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][isChained]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -7, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -780,12 +780,12 @@ static void WildMouseTrackFlatTo60DegUp(
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(frontImageIds[direction][isChained]);
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
}
else
{
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 29, 4, height + 2 }, { 1, 24, 43 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 4, height }, { 32, 2, 43 } });
}
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -827,12 +827,12 @@ static void WildMouseTrack60DegUpToFlat(
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(frontImageIds[direction][isChained]);
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
}
else
{
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 29, 4, height + 2 }, { 1, 24, 43 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 4, height }, { 32, 2, 43 } });
}
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -880,7 +880,7 @@ static void WildMouseTrackBrakes(
const TrackElement& trackElement)
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(_wild_mouse_brakes_image_ids[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -904,7 +904,7 @@ static void WildMouseTrackRotationControlToggle(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -922,7 +922,7 @@ static void WildMouseTrackBlockBrakes(
{
bool isClosed = trackElement.IsBrakeClosed();
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(_wild_mouse_block_brakes_image_ids[direction][isClosed]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);

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

File diff suppressed because it is too large Load Diff

4
src/openrct2/ride/coaster/WoodenRollerCoaster.h
View File

@ -47,8 +47,8 @@ PaintStruct* WoodenRCTrackPaint(
PaintAddImageAsParentRotated(
session, direction, imageId, { 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 });
{ { bound_box_offset_x, bound_box_offset_y, bound_box_offset_z },
{ bound_box_length_x, bound_box_length_y, bound_box_length_z } });
return PaintAddImageAsChildRotated(
session, direction, railsImageId, { x_offset, y_offset, z_offset },
{ bound_box_length_x, bound_box_length_y, bound_box_length_z },

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

@ -158,7 +158,7 @@ static void WoodenWildMouseTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][1]), { 0, 0, height - 2 },
{ 32, 28, 1 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 1 } });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]), { 0, 6, height },
{ 32, 20, 1 }, { 0, 0, height });
@ -191,7 +191,7 @@ static void WoodenWildMouseTrack25DegUp(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
WoodenASupportsPaintSetup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -232,12 +232,12 @@ static void WoodenWildMouseTrack60DegUp(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction]);
if (direction == 0 || direction == 3)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
}
else
{
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 6, height }, { 2, 24, 93 }, { 28, 4, height - 16 });
session, direction, imageId, { 0, 6, height }, { { 28, 4, height - 16 }, { 2, 24, 93 } });
}
WoodenASupportsPaintSetup(session, direction & 1, 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -277,7 +277,7 @@ static void WoodenWildMouseTrackFlatTo25DegUp(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
WoodenASupportsPaintSetup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -319,15 +319,15 @@ static void WoodenWildMouseTrack25DegUpTo60DegUp(
if (direction == 0 || direction == 3)
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
}
else
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
session, direction, imageId, { 0, 6, height }, { { 28, 4, height + 2 }, { 2, 24, 43 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { { 0, 4, height }, { 32, 2, 43 } });
}
WoodenASupportsPaintSetup(session, direction & 1, 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -369,15 +369,15 @@ static void WoodenWildMouseTrack60DegTo25DegUp(
if (direction == 0 || direction == 3)
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
}
else
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
session, direction, imageId, { 0, 6, height }, { { 28, 4, height + 2 }, { 2, 24, 43 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { { 0, 4, height }, { 32, 2, 43 } });
}
WoodenASupportsPaintSetup(session, direction & 1, 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -417,7 +417,7 @@ static void WoodenWildMouseTrack25DegUpToFlat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
WoodenASupportsPaintSetup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -614,14 +614,14 @@ static void WoodenWildMouseTrackFlatTo60DegUp(
if (direction == 0 || direction == 3)
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
}
else
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { { 28, 4, height + 2 }, { 2, 24, 43 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { { 0, 4, height }, { 32, 2, 43 } });
}
WoodenASupportsPaintSetup(session, direction & 1, 29 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -664,14 +664,14 @@ static void WoodenWildMouseTrack60DegUpToFlat(
if (direction == 0 || direction == 3)
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 1 } });
}
else
{
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 2, 24, 43 }, { 28, 4, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { { 28, 4, height + 2 }, { 2, 24, 43 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { { 0, 4, height }, { 32, 2, 43 } });
}
WoodenASupportsPaintSetup(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 PaintGhostTrainTrackFlat(
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPiecesFlat[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
auto tunnelImage = GetTunnelDoorsImageStraightFlat(trackElement, direction);
PaintUtilPushTunnelRotated(session, direction, height, tunnelImage);
@ -203,10 +203,10 @@ static void PaintGhostTrainTrack25DegUp(
const TrackElement& trackElement)
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPieces25DegUp[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPieces25DegUp[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 23 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 23 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -251,10 +251,10 @@ static void PaintGhostTrainTrackFlatTo25DegUp(
}
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPiecesFlatTo25DegUp[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPiecesFlatTo25DegUp[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 15 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 15 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -287,10 +287,10 @@ static void PaintGhostTrainTrack25DegUpToFlatShared(
const TrackElement& trackElement)
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPieces25DegUpToFlat[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPieces25DegUpToFlat[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 15 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 15 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -381,7 +381,7 @@ static void PaintGhostTrainStation(
};
imageId = session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height - 2 }, { 32, 28, 3 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height - 2 }, { { 0, 2, height }, { 32, 28, 3 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPiecesFlat[direction]);
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 0, height });
@ -497,7 +497,7 @@ static void PaintGhostTrainTrackSpinningTunnel(
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(ghost_train_track_pieces_spinning_tunnel_track[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 28, 20, 3 }, { 2, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 2, 6, height }, { 28, 20, 3 } });
TrackPaintUtilSpinningTunnelPaint(session, 3, height, direction);
@ -517,7 +517,7 @@ static void PaintGhostTrainTrackBrakes(
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(GhostTrainTrackPiecesBrakes[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
auto tunnelImage = GetTunnelDoorsImageStraightFlat(trackElement, direction);
PaintUtilPushTunnelRotated(session, direction, height, tunnelImage);

18
src/openrct2/ride/gentle/MiniGolf.cpp
View File

@ -528,10 +528,10 @@ static void PaintMiniGolfTrack25DegUp(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
imageId = session.TrackColours[SCHEME_MISC].WithIndex(MiniGolfTrackSprites25DegUp[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 15 }, { 0, 10, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 10, height + 2 }, { 32, 1, 15 } });
imageId = session.TrackColours[SCHEME_MISC].WithIndex(MiniGolfTrackSprites25DegUp[direction][2]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 15 }, { 0, 22, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 22, height + 2 }, { 32, 1, 15 } });
switch (direction)
{
@ -560,17 +560,17 @@ static void PaintMiniGolfTrackFlatTo25DegUp(
ImageId imageId;
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(MiniGolfTrackSpritesFlatTo25DegUp[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 1 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
imageId = session.TrackColours[SCHEME_MISC].WithIndex(MiniGolfTrackSpritesFlatTo25DegUp[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 11 }, { 0, 10, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 10, height + 2 }, { 32, 1, 11 } });
imageId = session.TrackColours[SCHEME_MISC].WithIndex(MiniGolfTrackSpritesFlatTo25DegUp[direction][2]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 11 }, { 0, 22, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 22, height + 2 }, { 32, 1, 11 } });
switch (direction)
{
@ -599,17 +599,17 @@ static void PaintMiniGolfTrack25DegUpToFlat(
ImageId imageId;
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(MiniGolfTrackSprites25DegUpToFlat[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 1 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
imageId = session.TrackColours[SCHEME_MISC].WithIndex(MiniGolfTrackSprites25DegUpToFlat[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 11 }, { 0, 10, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 10, height + 2 }, { 32, 1, 11 } });
imageId = session.TrackColours[SCHEME_MISC].WithIndex(MiniGolfTrackSprites25DegUpToFlat[direction][2]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 11 }, { 0, 22, height + 2 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 22, height + 2 }, { 32, 1, 11 } });
switch (direction)
{
@ -664,7 +664,7 @@ static void PaintMiniGolfStation(
bool hasFence;
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SprMiniGolfStationFloor);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 28, 1 }, { 0, 0, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 0, height }, { 32, 28, 1 } });
if (direction & 1)
{

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

@ -325,7 +325,7 @@ static void PaintMiniHelicoptersTrackSpinningTunnel(
ImageId imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][0]);
ImageId underlay = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParentRotated(session, direction, underlay, { 0, 6, height - 2 }, { 32, 20, 1 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, underlay, { 0, 6, height - 2 }, { { 0, 6, height }, { 32, 20, 1 } });
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
TrackPaintUtilSpinningTunnelPaint(session, 1, height, direction);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);

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

@ -643,7 +643,7 @@ static void PaintMiniatureRailwayTrackFlat(
if (isSupported)
{
imageId = session.TrackColours[SCHEME_SUPPORTS].WithIndex(miniature_railway_track_floor[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(miniature_railway_track_pieces_flat[direction]);
if (!paintAsGravel)
@ -671,22 +671,23 @@ static void PaintMiniatureRailwayTrackFlat(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(miniature_railway_track_pieces_flat[direction]);
if (!paintAsGravel)
{
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { { 0, 6, height }, { 32, 20, 2 } });
}
else
{
imageIdAlt = MiniatureRailwayTrackToGravel(imageId);
PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { { 0, 6, height }, { 32, 20, 2 } });
}
if (paintGrooved)
{
imageIdAlt = MiniatureRailwayTrackToGrooved(imageId);
PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height + 2 });
PaintAddImageAsParentRotated(
session, direction, imageIdAlt, { 0, 6, height }, { { 0, 6, height + 2 }, { 32, 20, 2 } });
imageIdAlt = MiniatureRailwayTrackToGroovedIndent(
session.PathElementOnSameHeight, direction, session.CurrentRotation);
PaintAddImageAsParentRotated(
session, direction, imageIdAlt.WithTransparency(FilterPaletteID::PaletteDarken2), { 0, 6, height },
{ 32, 20, 2 }, { 0, 6, height + 2 });
{ { 0, 6, height + 2 }, { 32, 20, 2 } });
}
}
@ -706,7 +707,7 @@ static void PaintMiniatureRailwayStation(
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
imageId = session.TrackColours[SCHEME_MISC].WithIndex(miniature_railway_station_floor[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height - 2 }, { 32, 28, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height - 2 }, { { 0, 2, height }, { 32, 28, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(miniature_railway_track_pieces_flat_station[direction]);
PaintAddImageAsChildRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 2 }, { 0, 0, height });
@ -727,7 +728,7 @@ static void PaintMiniatureRailwayTrack25DegUp(
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(miniature_railway_track_pieces_25_deg_up[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 2 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 2 } });
switch (direction)
{
@ -758,7 +759,7 @@ static void PaintMiniatureRailwayTrackFlatTo25DegUp(
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(miniature_railway_track_pieces_flat_to_25_deg_up[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 2 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 2 } });
switch (direction)
{
@ -789,7 +790,7 @@ static void PaintMiniatureRailwayTrack25DegUpToFlat(
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(miniature_railway_track_pieces_25_deg_up_to_flat[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 2 }, { 0, 3, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { { 0, 3, height }, { 32, 25, 2 } });
switch (direction)
{
@ -1127,15 +1128,15 @@ static void PaintMiniatureRailwayTrackSBendLeft(
if (!isSupported)
{
PaintAddImageAsParentRotated(
session, direction, imageId, { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 },
{ offset.x, offset.y, height });
session, direction, imageId, { offset.x, offset.y, height },
{ { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 } });
}
else
{
imageId = session.TrackColours[SCHEME_SUPPORTS].WithIndex(
miniature_railway_s_bend_left_tiles_track_floor[direction & 1][trackSequence]);
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 0, height }, { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
session, direction, imageId, { 0, 0, height }, { { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(
miniature_railway_track_pieces_s_bend_left[direction & 1][trackSequence]);
@ -1235,15 +1236,15 @@ static void PaintMiniatureRailwayTrackSBendRight(
if (!isSupported)
{
PaintAddImageAsParentRotated(
session, direction, imageId, { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 },
{ offset.x, offset.y, height });
session, direction, imageId, { offset.x, offset.y, height },
{ { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 } });
}
else
{
imageId = session.TrackColours[SCHEME_SUPPORTS].WithIndex(
miniature_railway_s_bend_right_tiles_track_floor[direction & 1][trackSequence]);
PaintAddImageAsParentRotated(
session, direction, imageId, { 0, 0, height }, { bounds.x, bounds.y, 2 }, { offset.x, offset.y, height });
session, direction, imageId, { 0, 0, height }, { { offset.x, offset.y, height }, { bounds.x, bounds.y, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(
miniature_railway_track_pieces_s_bend_right[direction & 1][trackSequence]);

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

@ -29,14 +29,14 @@ static void SuspendedMonorailTrackFlat(
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25853), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25853), { 0, 0, height + 32 },
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25854), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 32 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25854), { 0, 0, height + 32 },
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -65,10 +65,10 @@ static void SuspendedMonorailTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 28, 1 }, { 0, 2, height });
{ { 0, 2, height }, { 32, 28, 1 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_SUPPORTS].WithIndex(imageIds[direction][2]), { 0, 6, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
@ -88,23 +88,23 @@ static void SuspendedMonorailTrack25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25945), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 48 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25945), { 0, 0, height + 32 },
{ { 0, 6, height + 48 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25946), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 48 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25946), { 0, 0, height + 32 },
{ { 0, 6, height + 48 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25947), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 48 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25947), { 0, 0, height + 32 },
{ { 0, 6, height + 48 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25948), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 48 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25948), { 0, 0, height + 32 },
{ { 0, 6, height + 48 }, { 32, 20, 3 } });
break;
}
@ -153,23 +153,23 @@ static void SuspendedMonorailTrackFlatTo25DegUp(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25937), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25937), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25938), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25938), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25939), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25939), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25940), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25940), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
}
@ -218,23 +218,23 @@ static void SuspendedMonorailTrack25DegUpToFlat(
{
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25941), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25941), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25942), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25942), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25943), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25943), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25944), { 0, 0, height + 32 }, { 32, 20, 3 },
{ 0, 6, height + 40 });
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25944), { 0, 0, height + 32 },
{ { 0, 6, height + 40 }, { 32, 20, 3 } });
break;
}
@ -311,22 +311,22 @@ static void SuspendedMonorailTrackLeftQuarterTurn5(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25876), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25881), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25886), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25871), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -360,12 +360,12 @@ static void SuspendedMonorailTrackLeftQuarterTurn5(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25885), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 32, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25870), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 32, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -380,17 +380,17 @@ static void SuspendedMonorailTrackLeftQuarterTurn5(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25874), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25879), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 16, height + 32 });
{ { 16, 16, height + 32 }, { 16, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25884), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
@ -411,7 +411,7 @@ static void SuspendedMonorailTrackLeftQuarterTurn5(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25873), { 0, 0, height + 32 },
{ 16, 32, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 32, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
@ -426,7 +426,7 @@ static void SuspendedMonorailTrackLeftQuarterTurn5(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25868), { 0, 0, height + 32 },
{ 16, 32, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -441,22 +441,22 @@ static void SuspendedMonorailTrackLeftQuarterTurn5(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25872), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25877), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25882), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25867), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
}
@ -501,22 +501,22 @@ static void SuspendedMonorailTrackSBendLeft(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25919), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25923), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25922), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25926), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -546,12 +546,12 @@ static void SuspendedMonorailTrackSBendLeft(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25921), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25925), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
}
@ -579,12 +579,12 @@ static void SuspendedMonorailTrackSBendLeft(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25921), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25925), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
@ -622,22 +622,22 @@ static void SuspendedMonorailTrackSBendLeft(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25922), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25926), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25919), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25923), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -672,22 +672,22 @@ static void SuspendedMonorailTrackSBendRight(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25927), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25931), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25930), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25934), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -707,12 +707,12 @@ static void SuspendedMonorailTrackSBendRight(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25928), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25932), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
@ -760,12 +760,12 @@ static void SuspendedMonorailTrackSBendRight(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25928), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25932), { 0, 0, height + 32 },
{ 32, 26, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 26, 3 } });
break;
}
@ -793,22 +793,22 @@ static void SuspendedMonorailTrackSBendRight(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25930), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25934), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25927), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25931), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -843,22 +843,22 @@ static void SuspendedMonorailTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25860), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25863), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25866), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25857), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -882,7 +882,7 @@ static void SuspendedMonorailTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25859), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
@ -892,12 +892,12 @@ static void SuspendedMonorailTrackLeftQuarterTurn3(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25865), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 16, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25856), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 16, height + 32 });
{ { 16, 16, height + 32 }, { 16, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -910,22 +910,22 @@ static void SuspendedMonorailTrackLeftQuarterTurn3(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25858), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25861), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25864), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25855), { 0, 0, height + 32 },
{ 20, 32, 3 }, { 6, 0, height + 32 });
{ { 6, 0, height + 32 }, { 20, 32, 3 } });
break;
}
@ -970,22 +970,22 @@ static void SuspendedMonorailTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25903), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25907), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25911), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25915), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -1005,22 +1005,22 @@ static void SuspendedMonorailTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25904), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 32, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25908), { 0, 0, height + 32 },
{ 34, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 34, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25912), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 32, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25916), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 32, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1035,22 +1035,22 @@ static void SuspendedMonorailTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25905), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25909), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 16, height + 32 });
{ { 16, 16, height + 32 }, { 16, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25913), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25917), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 16, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1069,22 +1069,22 @@ static void SuspendedMonorailTrackLeftEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25906), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 16, height + 32 });
{ { 16, 16, height + 32 }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25910), { 0, 0, height + 32 },
{ 16, 18, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 16, 18, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25914), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 16, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25918), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 16, 3 } });
break;
}
@ -1130,22 +1130,22 @@ static void SuspendedMonorailTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25887), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25891), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25895), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25899), { 0, 0, height + 32 },
{ 32, 20, 3 }, { 0, 6, height + 32 });
{ { 0, 6, height + 32 }, { 32, 20, 3 } });
break;
}
@ -1165,22 +1165,22 @@ static void SuspendedMonorailTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25888), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 32, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25892), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 32, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25896), { 0, 0, height + 32 },
{ 34, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 34, 16, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25900), { 0, 0, height + 32 },
{ 32, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 32, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1195,22 +1195,22 @@ static void SuspendedMonorailTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25889), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25893), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25897), { 0, 0, height + 32 },
{ 28, 28, 3 }, { 4, 4, height + 32 });
{ { 4, 4, height + 32 }, { 28, 28, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25901), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 16, 16, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1229,22 +1229,22 @@ static void SuspendedMonorailTrackRightEighthToDiag(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25890), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 0, height + 32 });
{ { 16, 0, height + 32 }, { 16, 16, 3 } });
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25894), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 0, 0, height + 32 });
{ { 0, 0, height + 32 }, { 16, 16, 3 } });
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25898), { 0, 0, height + 32 },
{ 16, 18, 3 }, { 0, 16, height + 32 });
{ { 0, 16, height + 32 }, { 16, 18, 3 } });
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25902), { 0, 0, height + 32 },
{ 16, 16, 3 }, { 16, 16, height + 32 });
{ { 16, 16, height + 32 }, { 16, 16, 3 } });
break;
}
@ -1308,7 +1308,7 @@ static void SuspendedMonorailTrackDiagFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25936), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1321,7 +1321,7 @@ static void SuspendedMonorailTrackDiagFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25935), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1334,7 +1334,7 @@ static void SuspendedMonorailTrackDiagFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25935), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1347,7 +1347,7 @@ static void SuspendedMonorailTrackDiagFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25936), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 32 });
{ { -16, -16, height + 32 }, { 32, 32, 3 } });
break;
}
@ -1391,7 +1391,7 @@ static void SuspendedMonorailTrackDiag25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25960), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1404,7 +1404,7 @@ static void SuspendedMonorailTrackDiag25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25957), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1417,7 +1417,7 @@ static void SuspendedMonorailTrackDiag25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25959), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1430,7 +1430,7 @@ static void SuspendedMonorailTrackDiag25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25958), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
@ -1474,7 +1474,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegUp(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25952), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1487,7 +1487,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegUp(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25949), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1500,7 +1500,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegUp(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25951), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1513,7 +1513,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegUp(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25950), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
@ -1557,7 +1557,7 @@ static void SuspendedMonorailTrackDiag25DegUpToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25956), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1570,7 +1570,7 @@ static void SuspendedMonorailTrackDiag25DegUpToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25953), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1583,7 +1583,7 @@ static void SuspendedMonorailTrackDiag25DegUpToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25955), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1596,7 +1596,7 @@ static void SuspendedMonorailTrackDiag25DegUpToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25954), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
@ -1640,7 +1640,7 @@ static void SuspendedMonorailTrackDiag25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25958), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1653,7 +1653,7 @@ static void SuspendedMonorailTrackDiag25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25959), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1666,7 +1666,7 @@ static void SuspendedMonorailTrackDiag25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25957), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1679,7 +1679,7 @@ static void SuspendedMonorailTrackDiag25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25960), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 48 });
{ { -16, -16, height + 48 }, { 32, 32, 3 } });
break;
}
@ -1723,7 +1723,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegDown(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25954), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1735,7 +1735,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegDown(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25955), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1747,7 +1747,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegDown(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25953), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1759,7 +1759,7 @@ static void SuspendedMonorailTrackDiagFlatTo25DegDown(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25956), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
@ -1803,7 +1803,7 @@ static void SuspendedMonorailTrackDiag25DegDownToFlat(
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25950), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1816,7 +1816,7 @@ static void SuspendedMonorailTrackDiag25DegDownToFlat(
case 0:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25951), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1829,7 +1829,7 @@ static void SuspendedMonorailTrackDiag25DegDownToFlat(
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25949), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}
PaintUtilSetSegmentSupportHeight(
@ -1842,7 +1842,7 @@ static void SuspendedMonorailTrackDiag25DegDownToFlat(
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(25952), { -16, -16, height + 32 },
{ 32, 32, 3 }, { -16, -16, height + 40 });
{ { -16, -16, height + 40 }, { 32, 32, 3 } });
break;
}

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

@ -369,10 +369,10 @@ static void DinghySlideTrackFlat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 26 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -399,7 +399,7 @@ static void DinghySlideTrackStation(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 20, 1 }, { 0, 6, height + 3 });
{ { 0, 6, height + 3 }, { 32, 20, 1 } });
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][1]), { 0, 0, height },
{ 32, 32, 1 });
@ -438,10 +438,10 @@ static void DinghySlideTrack25DegUp(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 50 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -474,10 +474,10 @@ static void DinghySlideTrack60DegUp(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 98 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -519,10 +519,10 @@ static void DinghySlideTrackFlatTo25DegUp(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 42 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -555,10 +555,10 @@ static void DinghySlideTrack25DegUpTo60DegUp(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -591,10 +591,10 @@ static void DinghySlideTrack60DegUpTo25DegUp(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -636,10 +636,10 @@ static void DinghySlideTrack25DegUpToFlat(
uint8_t isChained = trackElement.HasChain() ? 1 : 0;
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 34 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -874,18 +874,18 @@ static void DinghySlideTrackSBendLeft(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(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, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 0 || direction == 1)
{
MetalASupportsPaintSetup(
@ -899,9 +899,9 @@ static void DinghySlideTrackSBendLeft(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 2 || direction == 3)
{
MetalASupportsPaintSetup(
@ -914,9 +914,9 @@ static void DinghySlideTrackSBendLeft(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -979,18 +979,18 @@ static void DinghySlideTrackSBendRight(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(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, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 0 || direction == 1)
{
MetalASupportsPaintSetup(
@ -1003,9 +1003,9 @@ static void DinghySlideTrackSBendRight(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 2 || direction == 3)
{
MetalASupportsPaintSetup(
@ -1017,9 +1017,9 @@ static void DinghySlideTrackSBendRight(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1145,10 +1145,10 @@ static void DinghySlideTrackFlatCovered(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 26 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -1174,10 +1174,10 @@ static void DinghySlideTrack25DegUpCovered(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 50 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -1210,10 +1210,10 @@ static void DinghySlideTrack60DegUpCovered(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 98 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -1246,10 +1246,10 @@ static void DinghySlideTrackFlatTo25DegUpCovered(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 42 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -1282,10 +1282,10 @@ static void DinghySlideTrack25DegUpTo60DegUpCovered(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -1318,10 +1318,10 @@ static void DinghySlideTrack60DegUpTo25DegUpCovered(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -1354,10 +1354,10 @@ static void DinghySlideTrack25DegUpToFlatCovered(
};
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 34 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -1585,18 +1585,18 @@ static void DinghySlideTrackSBendLeftCovered(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(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, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 0 || direction == 1)
{
MetalASupportsPaintSetup(
@ -1610,9 +1610,9 @@ static void DinghySlideTrackSBendLeftCovered(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 2 || direction == 3)
{
MetalASupportsPaintSetup(
@ -1625,9 +1625,9 @@ static void DinghySlideTrackSBendLeftCovered(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1690,18 +1690,18 @@ static void DinghySlideTrackSBendRightCovered(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(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, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 0 || direction == 1)
{
MetalASupportsPaintSetup(
@ -1714,9 +1714,9 @@ static void DinghySlideTrackSBendRightCovered(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 2 || direction == 3)
{
MetalASupportsPaintSetup(
@ -1728,9 +1728,9 @@ static void DinghySlideTrackSBendRightCovered(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

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

@ -168,8 +168,8 @@ static void PaintLogFlumeTrackFlat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(LogFlumeTrackFlatImageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(LogFlumeTrackFlatImageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 26 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -187,7 +187,7 @@ static void PaintLogFlumeTrackStation(
const TrackElement& trackElement)
{
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(LogFlumeTrackFlatImageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height + 3 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height + 3 }, { 32, 20, 1 } });
if (direction & 1)
{
@ -233,8 +233,8 @@ static void PaintLogFlumeTrack25DegUp(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 50 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -268,8 +268,8 @@ static void PaintLogFlumeTrackFlatTo25DegUp(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 42 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -303,8 +303,8 @@ static void PaintLogFlumeTrack25DegUpToFlat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 34 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -338,8 +338,8 @@ static void PaintLogFlumeTrack25DegDown(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 50 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -373,8 +373,8 @@ static void PaintLogFlumeTrackFlatTo25DegDown(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 34 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -408,8 +408,8 @@ static void PaintLogFlumeTrack25DegDownToFlat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 42 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
@ -467,18 +467,18 @@ static void PaintLogFlumeTrackSBendLeft(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(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, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 0 || direction == 1)
{
MetalASupportsPaintSetup(
@ -492,9 +492,9 @@ static void PaintLogFlumeTrackSBendLeft(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 2 || direction == 3)
{
MetalASupportsPaintSetup(
@ -507,9 +507,9 @@ static void PaintLogFlumeTrackSBendLeft(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -572,18 +572,18 @@ static void PaintLogFlumeTrackSBendRight(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(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, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 0 || direction == 1)
{
MetalASupportsPaintSetup(
@ -596,9 +596,9 @@ static void PaintLogFlumeTrackSBendRight(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
if (direction == 2 || direction == 3)
{
MetalASupportsPaintSetup(
@ -610,9 +610,9 @@ static void PaintLogFlumeTrackSBendRight(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -813,10 +813,10 @@ static void PaintLogFlumeTrackOnRidePhoto(
}
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(LogFlumeTrackFlatImageIds[direction][0]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 0 }, { 0, 6, height + 3 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height + 3 }, { 32, 20, 0 } });
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(LogFlumeTrackFlatImageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 21 }, { 0, 27, height + 5 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height + 5 }, { 32, 1, 21 } });
TrackPaintUtilOnridePhotoPaint(session, direction, height + 3, trackElement);
@ -839,8 +839,8 @@ static void PaintLogFlumeTrackReverser(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 26 } });
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -866,8 +866,8 @@ static void LogFlumeTrack25Down60(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height + 4 });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 20, 0 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height + 4 }, { 32, 1, 42 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 0 } });
if (direction == 1 || direction == 2)
{
@ -906,8 +906,8 @@ static void LogFlumeTrack60Down(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height + 4 });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height + 4 }, { 32, 1, 98 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
if (direction == 1 || direction == 2)
{
@ -946,8 +946,8 @@ static void LogFlumeTrack60Down25(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height + 4 });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 20, 0 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 27, height + 4 }, { 32, 1, 42 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 0 } });
if (direction == 1 || direction == 2)
{

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

@ -481,8 +481,8 @@ static void PaintSplashBoatsTrack25DegUp(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegUpImageId[direction]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegUpFrontImageId[direction]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 50 } });
WoodenASupportsPaintSetup(session, (direction & 1), 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -506,8 +506,8 @@ static void PaintSplashBoatsTrack60DegUp(
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats60DegUpFrontImageId[direction]);
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
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 });
session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 98 } });
WoodenASupportsPaintSetup(session, (direction & 1), 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -530,8 +530,8 @@ static void PaintSplashBoatsTrackFlatTo25DegUp(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoatsFlatTo25DegUpImageId[direction]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoatsFlatTo25DegUpFrontImageId[direction]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 42 } });
WoodenASupportsPaintSetup(session, (direction & 1), 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -554,8 +554,8 @@ static void PaintSplashBoatsTrack25DegUpToFlat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegUpToFlatImageId[direction]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegUpToFlatFrontImageId[direction]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 34 } });
WoodenASupportsPaintSetup(session, (direction & 1), 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -579,8 +579,8 @@ static void PaintSplashBoatsTrack25DegUpTo60DegUp(
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegUpTo60DegUpFrontImageId[direction]);
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
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 });
session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
WoodenASupportsPaintSetup(session, (direction & 1), 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -604,8 +604,8 @@ static void PaintSplashBoatsTrack60DegUpTo25DegUp(
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats60DegUpTo25DegUpFrontImageId[direction]);
session.WoodenSupportsPrependTo = PaintAddImageAsParentRotated(
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 });
session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 66 } });
WoodenASupportsPaintSetup(session, (direction & 1), 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -628,8 +628,8 @@ static void PaintSplashBoatsTrack25DegDown(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegDownImageId[direction]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegDownFrontImageId[direction]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 50 } });
static constexpr const uint8_t specialSupport[] = { 11, 12, 9, 10 };
WoodenASupportsPaintSetup(
@ -661,8 +661,8 @@ static void PaintSplashBoatsTrackFlatTo25DegDown(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoatsFlatTo25DegDownImageId[direction]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoatsFlatTo25DegDownFrontImageId[direction]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 34 } });
static constexpr const uint8_t specialSupport[] = { 7, 8, 5, 6 };
WoodenASupportsPaintSetup(
@ -701,8 +701,8 @@ static void PaintSplashBoatsTrack25DegDownToFlat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegDownToFlatImageId[direction]);
auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(SplashBoats25DegDownToFlatFrontImageId[direction]);
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 });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, 2 } });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 42 } });
static constexpr const uint8_t specialSupport[] = { 3, 4, 1, 2 };
WoodenASupportsPaintSetup(
@ -997,17 +997,17 @@ static void PaintSplashBoatsTrackSBendLeft(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;
case 1:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
WoodenASupportsPaintSetup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1018,9 +1018,9 @@ static void PaintSplashBoatsTrackSBendLeft(
break;
case 2:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
WoodenASupportsPaintSetup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1030,9 +1030,9 @@ static void PaintSplashBoatsTrackSBendLeft(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;
@ -1097,17 +1097,17 @@ static void PaintSplashBoatsTrackSBendRight(
switch (trackSequence)
{
case 0:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;
case 1:
bboy = (direction == 2 || direction == 3) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
WoodenASupportsPaintSetup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1118,9 +1118,9 @@ static void PaintSplashBoatsTrackSBendRight(
break;
case 2:
bboy = (direction == 0 || direction == 1) ? 0 : 6;
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 26, 2 }, { 0, bboy, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, bboy, height }, { 32, 26, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, bboy, height + 27 }, { 32, 26, 0 } });
WoodenASupportsPaintSetup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
@ -1130,9 +1130,9 @@ static void PaintSplashBoatsTrackSBendRight(
0xFFFF, 0);
break;
case 3:
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { { 0, 2, height }, { 32, 27, 2 } });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
session, direction, frontImageId, { 0, 0, height }, { { 0, 2, height + 27 }, { 32, 27, 0 } });
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;