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

Code style: Remove snakes from wooden supports

This commit is contained in:
Rik Smeets 2022-10-08 19:06:31 +02:00
parent 5dba30778d
commit 29f61fd403
46 changed files with 2940 additions and 2942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/paint/Supports.cpp
View File

@ -445,16 +445,16 @@ static constexpr const uint16_t word_97B3C4[] = {
// clang-format on
bool wooden_a_supports_paint_setup(
bool WoodenASupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags)
{
return wooden_a_supports_paint_setup(session, supportType, special, height, ImageId::FromUInt32(imageColourFlags));
return WoodenASupportsPaintSetup(session, supportType, special, height, ImageId::FromUInt32(imageColourFlags));
}
bool wooden_b_supports_paint_setup(
bool WoodenBSupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags)
{
return wooden_a_supports_paint_setup(session, supportType, special, height, ImageId::FromUInt32(imageColourFlags));
return WoodenASupportsPaintSetup(session, supportType, special, height, ImageId::FromUInt32(imageColourFlags));
}
/**
@ -467,7 +467,7 @@ bool wooden_b_supports_paint_setup(
* @param[out] underground (Carry flag) true if underground.
* @returns (al) true if any supports have been drawn, otherwise false.
*/
bool wooden_a_supports_paint_setup(
bool WoodenASupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate)
{
if (!(session.Flags & PaintSessionFlags::PassedSurface))
@ -628,7 +628,7 @@ bool wooden_a_supports_paint_setup(
*
* @return (al) whether supports have been drawn
*/
bool wooden_b_supports_paint_setup(
bool WoodenBSupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate)
{
if (!(session.Flags & PaintSessionFlags::PassedSurface))

8
src/openrct2/paint/Supports.h
View File

@ -17,13 +17,13 @@ struct FootpathPaintInfo;
constexpr const uint8_t NumVanillaWoodenSupportTypes = 49;
bool wooden_a_supports_paint_setup(
bool WoodenASupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate);
bool wooden_b_supports_paint_setup(
bool WoodenBSupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate);
bool wooden_a_supports_paint_setup(
bool WoodenASupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags);
bool wooden_b_supports_paint_setup(
bool WoodenBSupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags);
bool metal_a_supports_paint_setup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags);

4
src/openrct2/paint/tile_element/Paint.Entrance.cpp
View File

@ -198,7 +198,7 @@ static void PaintRideEntranceExit(paint_session& session, uint8_t direction, int
{
supportsImageTemplate = ImageId().WithPrimary(COLOUR_SATURATED_BROWN);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, supportsImageTemplate);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, supportsImageTemplate);
height += isExit ? 40 : 56;
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -326,7 +326,7 @@ static void PaintParkEntrance(paint_session& session, uint8_t direction, int32_t
{
supportsImageTemplate = ImageId().WithPrimary(COLOUR_SATURATED_BROWN);
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, supportsImageTemplate);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, supportsImageTemplate);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 80, 0x20);

2
src/openrct2/paint/tile_element/Paint.LargeScenery.cpp
View File

@ -69,7 +69,7 @@ static void PaintLargeScenerySupports(
special = 49;
}
wooden_b_supports_paint_setup(session, (direction & 1), special, supportHeight, imageTemplate);
WoodenBSupportsPaintSetup(session, (direction & 1), special, supportHeight, imageTemplate);
int32_t clearanceHeight = ceil2(tileElement.GetClearanceZ() + 15, 16);
if (tile.flags & LARGE_SCENERY_TILE_FLAG_ALLOW_SUPPORTS_ABOVE)

2
src/openrct2/paint/tile_element/Paint.SmallScenery.cpp
View File

@ -61,7 +61,7 @@ static void PaintSmallScenerySupports(
}
auto supportType = (direction & 1) ? 1 : 0;
wooden_b_supports_paint_setup(session, supportType, special, supportHeight, supportImageTemplate);
WoodenBSupportsPaintSetup(session, supportType, special, supportHeight, supportImageTemplate);
}
static void SetSupportHeights(

2
src/openrct2/ride/TrackPaint.cpp
View File

@ -1532,7 +1532,7 @@ void track_paint_util_right_quarter_turn_5_tiles_wooden_supports(
{ 1, 0xFF, 3, 5, 0xFF, 3, 0 },
};
uint8_t supportType = supportTypes[direction][trackSequence];
wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}

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

@ -190,7 +190,7 @@ static void air_powered_vertical_rc_track_flat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -216,7 +216,7 @@ static void air_powered_vertical_rc_track_station(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]), { 0, 0, height },
{ 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_narrow_station_platform(session, ride, direction, height, 5, trackElement);
@ -336,7 +336,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -365,7 +365,7 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -514,7 +514,7 @@ static void air_powered_vertical_rc_track_left_bank(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -543,7 +543,7 @@ static void air_powered_vertical_rc_track_brakes(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -664,7 +664,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { 20, 32, bbHeight }, { 0, 6, height });
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -692,7 +692,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
session, direction, trackImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (trackSequence == 0)
{
@ -720,12 +720,12 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence], 0x20);
break;
case 5:
if (wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]))
if (WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]))
{
ImageId floorImageId;
if (direction & 1)
@ -763,7 +763,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetVerticalTunnel(session, height + 240);
@ -940,7 +940,7 @@ static void air_powered_vertical_rc_track_booster(
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -959,7 +959,7 @@ static void air_powered_vertical_rc_track_onride_photo(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);

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

@ -252,7 +252,7 @@ static void classic_wooden_rc_track_flat_to_left_bank(
};
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -285,7 +285,7 @@ static void classic_wooden_rc_track_flat_to_right_bank(
};
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -331,7 +331,7 @@ static void classic_wooden_rc_track_left_bank(
}
};
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -371,7 +371,7 @@ static void classic_wooden_rc_track_left_bank_to_25_deg_up(
};
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -412,7 +412,7 @@ static void classic_wooden_rc_track_right_bank_to_25_deg_up(
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
@ -453,7 +453,7 @@ static void classic_wooden_rc_track_25_deg_up_to_left_bank(
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
@ -494,7 +494,7 @@ static void classic_wooden_rc_track_25_deg_up_to_right_bank(
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][1], height);
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_FLAT);
@ -696,7 +696,7 @@ static void classic_wooden_rc_track_banked_right_quarter_turn_5(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments[trackSequence], direction), 0xFFFF, 0);
@ -815,7 +815,7 @@ static void classic_wooden_rc_track_right_quarter_turn_3_bank(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -952,7 +952,7 @@ static void classic_wooden_rc_track_left_eighth_bank_to_diag(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
@ -1091,7 +1091,7 @@ static void classic_wooden_rc_track_right_eighth_bank_to_diag(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
wooden_rc_track_paint_bb<true>(session, &imageIds[direction][trackSequence][0], height);
@ -1205,7 +1205,7 @@ static void classic_wooden_rc_track_diag_flat_to_left_bank(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1303,7 +1303,7 @@ static void classic_wooden_rc_track_diag_flat_to_right_bank(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1416,7 +1416,7 @@ static void classic_wooden_rc_track_diag_left_bank(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1521,7 +1521,7 @@ static void classic_wooden_rc_track_diag_left_bank_to_25_deg_up(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1619,7 +1619,7 @@ static void classic_wooden_rc_track_diag_right_bank_to_25_deg_up(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1717,7 +1717,7 @@ static void classic_wooden_rc_track_diag_25_deg_up_to_left_bank(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1815,7 +1815,7 @@ static void classic_wooden_rc_track_diag_25_deg_up_to_right_bank(
if (supportType[direction][trackSequence] != -1)
{
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -212,7 +212,7 @@ static void paint_reverse_freefall_rc_flat(
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -233,7 +233,7 @@ static void paint_reverse_freefall_rc_station(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(reverse_freefall_rc_track_pieces_station[direction]);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
@ -246,7 +246,7 @@ static void paint_reverse_freefall_rc_station(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(reverse_freefall_rc_track_pieces_station[direction]);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { 20, 32, 1 }, { 6, 0, height });
wooden_a_supports_paint_setup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1) ? 1 : 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
}
@ -305,12 +305,12 @@ static void paint_reverse_freefall_rc_slope(
session, direction, supportsImageId, { 0, 0, height }, { 32, 20, bbHeight }, { 0, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence], 0x20);
break;
case 5:
if (wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]))
if (WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]))
{
ImageId floorImageId;
if (direction & 1)
@ -350,7 +350,7 @@ static void paint_reverse_freefall_rc_slope(
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { 1, 20, 126 }, { 27, 6, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence], 0x20);
break;
@ -412,7 +412,7 @@ static void paint_reverse_freefall_rc_onride_photo(
PaintAddImageAsParentRotated(
session, direction, colour.WithIndex(imageIds[direction]), { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_onride_photo_paint(session, direction, height + 3, trackElement);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -244,7 +244,7 @@ static void paint_virginia_reel_track_flat(
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -281,19 +281,19 @@ static void paint_virginia_reel_track_25_deg_up(
switch (direction)
{
case 0:
wooden_a_supports_paint_setup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -320,27 +320,27 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(
case 0:
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
wooden_a_supports_paint_setup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
ps = PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 27, 32, 2 }, { 2, 0, height });
session.WoodenSupportsPrependTo = ps;
wooden_a_supports_paint_setup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_8);
break;
case 2:
ps = PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
session.WoodenSupportsPrependTo = ps;
wooden_a_supports_paint_setup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_8);
break;
case 3:
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 27, 32, 2 }, { 2, 0, height });
wooden_a_supports_paint_setup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -380,19 +380,19 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
wooden_a_supports_paint_setup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height + 8, TUNNEL_14);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height + 8, TUNNEL_14);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -453,7 +453,7 @@ static void paint_virginia_reel_station(
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -485,7 +485,7 @@ static void paint_virginia_reel_track_left_quarter_turn_3_tiles(
break;
case 0:
case 3:
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, virginia_reel_left_quarter_turn_supports[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(SEGMENTS_ALL, direction), 0xFFFF, 0);
break;
@ -523,18 +523,18 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile(
switch (direction)
{
case 0:
wooden_a_supports_paint_setup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
wooden_a_supports_paint_setup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
break;
case 3:
wooden_a_supports_paint_setup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
break;

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

File diff suppressed because it is too large Load Diff

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

@ -134,7 +134,7 @@ static void wooden_wild_mouse_track_flat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 1 });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
session,
@ -162,7 +162,7 @@ static void wooden_wild_mouse_track_station(
PaintAddImageAsChildRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]), { 0, 6, height },
{ 32, 20, 1 }, { 0, 0, height });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
@ -193,7 +193,7 @@ static void wooden_wild_mouse_track_25_deg_up(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
wooden_a_supports_paint_setup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -240,7 +240,7 @@ static void wooden_wild_mouse_track_60_deg_up(
session, direction, imageId, { 0, 6, height }, { 2, 24, 93 }, { 28, 4, height - 16 });
}
wooden_a_supports_paint_setup(session, direction & 1, 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -279,7 +279,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
wooden_a_supports_paint_setup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -330,7 +330,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -380,7 +380,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -419,7 +419,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[isChained][direction]);
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 2, height }, { 32, 25, 1 }, { 0, 3, height });
wooden_a_supports_paint_setup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -518,7 +518,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_3(
{
case 0:
case 3:
wooden_a_supports_paint_setup(session, supportType[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportType[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -575,7 +575,7 @@ static void wooden_wild_mouse_track_left_quarter_turn_1(
PaintAddImageAsParent(session, imageId, { 6, 6, height }, { 24, 24, 1 });
break;
}
wooden_a_supports_paint_setup(session, supportType[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportType[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, 0, TUNNEL_0, 0, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -624,7 +624,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 29 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 29 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -674,7 +674,7 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 2, 43 }, { 0, 4, height });
}
wooden_a_supports_paint_setup(session, direction & 1, 33 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 33 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{

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

@ -489,7 +489,7 @@ static void PaintCarRideTrackSpinningTunnel(
PaintUtilPushTunnelRight(session, height, TUNNEL_0);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

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

@ -53,7 +53,7 @@ static void PaintCircus(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -88,7 +88,7 @@ static void PaintCrookedHouse(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -51,7 +51,7 @@ static void PaintDodgems(
int32_t edges = edges_4x4[relativeTrackSequence];
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -117,7 +117,7 @@ static void PaintFerrisWheel(
edges = Edges1X4NeSw[relativeTrackSequence];
}
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -42,7 +42,7 @@ static void paint_flying_saucers(
int32_t edges = edges_4x4[relativeTrackSequence];
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -504,7 +504,7 @@ static void PaintGhostTrainTrackSpinningTunnel(
auto tunnelImage = GetTunnelDoorsImageStraightFlat(trackElement, direction);
PaintUtilPushTunnelRotated(session, direction, height, tunnelImage);
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

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

@ -68,7 +68,7 @@ static void PaintHauntedHouse(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -64,7 +64,7 @@ static void MazePaintSetup(
auto imageId = session.TrackColours[SCHEME_MISC].WithIndex(SPR_TERRAIN_DIRT);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 0 });
wooden_a_supports_paint_setup(session, (rotation & 1) ? 0 : 1, 0, height, session.TrackColours[SCHEME_3]);
WoodenASupportsPaintSetup(session, (rotation & 1) ? 0 : 1, 0, height, session.TrackColours[SCHEME_3]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL & ~SEGMENT_C4, 0xFFFF, 0);

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

@ -106,7 +106,7 @@ static void PaintMerryGoRound(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -726,7 +726,7 @@ static void PaintMiniGolfStation(
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -826,8 +826,7 @@ static void PaintMiniGolfHoleAb(
ImageId imageId;
CoordsXY boundBox, boundBoxOffset;
bool drewSupports = wooden_a_supports_paint_setup(
session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
bool drewSupports = WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -899,8 +898,7 @@ static void PaintMiniGolfHoleC(
ImageId imageId;
CoordsXY boundBox, boundBoxOffset;
bool drewSupports = wooden_a_supports_paint_setup(
session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
bool drewSupports = WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -974,7 +972,7 @@ static void PaintMiniGolfHoleD(
int32_t supportType = (direction & 1);
if (trackSequence == 2)
supportType = 1 - supportType;
bool drewSupports = wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
bool drewSupports = WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -1068,7 +1066,7 @@ static void PaintMiniGolfHoleE(
int32_t supportType = (direction & 1);
if (trackSequence == 2)
supportType = 1 - supportType;
bool drewSupports = wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
bool drewSupports = WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

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

@ -88,7 +88,7 @@ static void PaintObservationTowerBase(
int32_t edges = edges_3x3[trackSequence];
CoordsXY position = session.MapPosition;
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

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

@ -95,7 +95,7 @@ static void PaintSpaceRings(
ImageId imageId;
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();
track_paint_util_paint_floor(session, edges, session.TrackColours[SCHEME_TRACK], height, floorSpritesCork, stationObject);

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

@ -205,7 +205,7 @@ static void PaintSpiralSlide(
int32_t edges = edges_2x2[trackSequence];
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
// Base
const StationObject* stationObject = ride.GetStationObject();

2
src/openrct2/ride/shops/Facility.cpp
View File

@ -22,7 +22,7 @@ static void PaintFacility(
paint_session& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_3]);
bool hasSupports = WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_3]);
auto rideEntry = ride.GetRideEntry();
if (rideEntry == nullptr)

2
src/openrct2/ride/shops/Shop.cpp
View File

@ -22,7 +22,7 @@ static void PaintShop(
paint_session& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_3]);
bool hasSupports = WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_3]);
auto rideEntry = ride.GetRideEntry();
if (rideEntry == nullptr)

2
src/openrct2/ride/thrill/3dCinema.cpp
View File

@ -56,7 +56,7 @@ static void Paint3dCinema(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

2
src/openrct2/ride/thrill/Enterprise.cpp
View File

@ -95,7 +95,7 @@ static void PaintEnterprise(
int32_t edges = edges_4x4[trackSequence];
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();
track_paint_util_paint_floor(session, edges, session.TrackColours[SCHEME_TRACK], height, floorSpritesCork, stationObject);

30
src/openrct2/ride/thrill/GoKarts.cpp
View File

@ -151,7 +151,7 @@ static void paint_go_karts_track_flat(
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -190,19 +190,19 @@ static void paint_go_karts_track_25_deg_up(
switch (direction)
{
case 0:
wooden_a_supports_paint_setup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height - 8, TUNNEL_SQUARE_7);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height + 8, TUNNEL_SQUARE_8);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height + 8, TUNNEL_SQUARE_8);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -244,19 +244,19 @@ static void paint_go_karts_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
wooden_a_supports_paint_setup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_8);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_8);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -298,19 +298,19 @@ static void paint_go_karts_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
wooden_a_supports_paint_setup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
case 1:
wooden_a_supports_paint_setup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height + 8, TUNNEL_14);
break;
case 2:
wooden_a_supports_paint_setup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height + 8, TUNNEL_14);
break;
case 3:
wooden_a_supports_paint_setup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -446,7 +446,7 @@ static void paint_go_karts_station(
}
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -516,7 +516,7 @@ static void paint_go_karts_track_left_quarter_turn_1_tile(
break;
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

2
src/openrct2/ride/thrill/LaunchedFreefall.cpp
View File

@ -95,7 +95,7 @@ static void paint_launched_freefall_base(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

2
src/openrct2/ride/thrill/MotionSimulator.cpp
View File

@ -109,7 +109,7 @@ static void PaintMotionSimulator(
int32_t edges = edges_2x2[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

2
src/openrct2/ride/thrill/RotoDrop.cpp
View File

@ -107,7 +107,7 @@ static void paint_roto_drop_base(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

2
src/openrct2/ride/thrill/SwingingShip.cpp
View File

@ -163,7 +163,7 @@ static void PaintSwingingShip(
if (relativeTrackSequence == 1 || relativeTrackSequence == 4)
{
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else if (direction & 1)
{

2
src/openrct2/ride/thrill/TopSpin.cpp
View File

@ -189,7 +189,7 @@ static void PaintTopSpin(
int32_t edges = edges_3x3[trackSequence];
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();

2
src/openrct2/ride/thrill/Twist.cpp
View File

@ -91,7 +91,7 @@ static void paint_twist(
ImageId imageId;
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_MISC]);
const StationObject* stationObject = ride.GetStationObject();
track_paint_util_paint_floor(session, edges, session.TrackColours[SCHEME_MISC], height, floorSpritesCork, stationObject);

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

@ -188,7 +188,7 @@ static void chairlift_paint_station_ne_sw(
const auto* stationObj = ride.GetStationObject();
wooden_a_supports_paint_setup(session, 0, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, 0, 0, height, session.TrackColours[SCHEME_MISC]);
if (!isStart && !isEnd)
{
@ -280,7 +280,7 @@ static void chairlift_paint_station_se_nw(
const auto* stationObj = ride.GetStationObject();
wooden_a_supports_paint_setup(session, 1, 0, height, session.TrackColours[SCHEME_MISC]);
WoodenASupportsPaintSetup(session, 1, 0, height, session.TrackColours[SCHEME_MISC]);
if (!isStart && !isEnd)
{

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

@ -635,7 +635,7 @@ static void paint_miniature_railway_track_flat(
paintGrooved = true;
}
bool isSupported = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
bool isSupported = WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
ImageId imageId, imageIdAlt;
// In the following 3 calls to PaintAddImageAsParentRotated/PaintAddImageAsChildRotated, we add 1 to the
@ -703,7 +703,7 @@ static void paint_miniature_railway_station(
{
ImageId imageId;
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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 });
@ -745,7 +745,7 @@ static void paint_miniature_railway_track_25_deg_up(
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 45 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 45 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -776,7 +776,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 37 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 37 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -807,7 +807,7 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(
break;
}
wooden_a_supports_paint_setup(session, direction & 1, 41 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 41 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -979,7 +979,7 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(
{
if (right_quarter_turn_5_supports_type[direction][trackSequence] != -1)
{
bool isSupported = wooden_a_supports_paint_setup(
bool isSupported = WoodenASupportsPaintSetup(
session, right_quarter_turn_5_supports_type[direction][trackSequence], 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
@ -1103,7 +1103,7 @@ static void paint_miniature_railway_track_s_bend_left(
trackSequence = 3 - trackSequence;
}
bool isSupported = wooden_a_supports_paint_setup(
bool isSupported = WoodenASupportsPaintSetup(
session, s_bend_left_supports_type[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
static constexpr const CoordsXY offsetList[] = {
@ -1212,7 +1212,7 @@ static void paint_miniature_railway_track_s_bend_right(
trackSequence = 3 - trackSequence;
}
bool isSupported = wooden_a_supports_paint_setup(
bool isSupported = WoodenASupportsPaintSetup(
session, s_bend_right_supports_type[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
static constexpr const CoordsXY offsetList[] = {
@ -1344,7 +1344,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(
if (trackSequence != 1 && trackSequence != 2)
{
static constexpr const uint8_t supportType[] = { 4, 5, 2, 3 };
isSupported = wooden_a_supports_paint_setup(
isSupported = WoodenASupportsPaintSetup(
session, supportType[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (!isSupported)
@ -1527,7 +1527,7 @@ static void paint_miniature_railway_track_left_eighth_to_diag(
// for track sequence 4
if (trackSequence != 4 || !isRightEighthToOrthog)
{
isSupported = wooden_a_supports_paint_setup(
isSupported = WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
ImageId imageId;
@ -1691,7 +1691,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag(
// for track sequence 4
if (trackSequence != 4 || !isLeftEighthToOrthog)
{
isSupported = wooden_a_supports_paint_setup(
isSupported = WoodenASupportsPaintSetup(
session, supportType[direction][trackSequence], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1820,7 +1820,7 @@ static void miniature_railway_track_diag_flat(
floorImage = floors[supportType].image_id;
floorBoundSize = floors[supportType].bound_size;
floorBoundOffset = floors[supportType].bound_offset;
isSupported = wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
isSupported = WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 1 && trackSequence == 3)
@ -1866,10 +1866,10 @@ static bool wooden_supports_paint_setup(
switch (woodType)
{
case WOOD_A:
return wooden_a_supports_paint_setup(session, supportType, special, height, imageColourFlags);
return WoodenASupportsPaintSetup(session, supportType, special, height, imageColourFlags);
case WOOD_B:
return wooden_b_supports_paint_setup(session, supportType, special, height, imageColourFlags);
return WoodenBSupportsPaintSetup(session, supportType, special, height, imageColourFlags);
}
return false;
@ -1972,7 +1972,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_up(
floorImage = floors[supportType].image_id;
floorBoundSize = floors[supportType].bound_size;
floorBoundOffset = floors[supportType].bound_offset;
hasSupports = wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
hasSupports = WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 1 && trackSequence == 3)
@ -2246,7 +2246,7 @@ static void miniature_railway_track_diag_25_deg_down_to_flat(
floorImage = floors[supportType].image_id;
floorBoundSize = floors[supportType].bound_size;
floorBoundOffset = floors[supportType].bound_offset;
hasSupports = wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
hasSupports = WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 1 && trackSequence == 3)

36
src/openrct2/ride/water/RiverRapids.cpp
View File

@ -303,7 +303,7 @@ static void paint_river_rapids_track_flat(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 3 }, { 0, 27, height + 17 });
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction & 1)
{
@ -343,7 +343,7 @@ static void paint_river_rapids_track_25_deg(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height - 8, TUNNEL_SQUARE_7);
break;
@ -355,7 +355,7 @@ static void paint_river_rapids_track_25_deg(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 1, 32, 34 }, { 27, 0, height + 16 });
wooden_a_supports_paint_setup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 10, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height + 8, TUNNEL_SQUARE_8);
break;
@ -367,7 +367,7 @@ static void paint_river_rapids_track_25_deg(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height + 8, TUNNEL_SQUARE_8);
break;
@ -378,7 +378,7 @@ static void paint_river_rapids_track_25_deg(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 1, 32, 34 }, { 27, 0, height + 16 });
wooden_a_supports_paint_setup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height - 8, TUNNEL_SQUARE_7);
break;
}
@ -402,7 +402,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 18 }, { 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
@ -414,7 +414,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 1, 32, 18 }, { 27, 0, height + 16 });
wooden_a_supports_paint_setup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height + 8, TUNNEL_14);
break;
@ -426,7 +426,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 18 }, { 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height + 8, TUNNEL_14);
break;
@ -437,7 +437,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 1, 32, 18 }, { 27, 0, height + 16 });
wooden_a_supports_paint_setup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height - 8, TUNNEL_SQUARE_FLAT);
break;
}
@ -461,7 +461,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
break;
@ -473,7 +473,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 1, 32, 26 }, { 27, 0, height + 16 });
wooden_a_supports_paint_setup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_8);
break;
@ -485,7 +485,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height + 16 });
wooden_a_supports_paint_setup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 0, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_8);
break;
@ -496,7 +496,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(sprites[direction][1]);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 1, 32, 26 }, { 27, 0, height + 16 });
wooden_a_supports_paint_setup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1, 4, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
break;
}
@ -606,7 +606,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(
break;
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -663,7 +663,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(
break;
}
wooden_a_supports_paint_setup(session, 1 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, 1 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -716,7 +716,7 @@ static void paint_river_rapids_track_waterfall(
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { 32, 1, 27 }, { 0, 27, height + 17 });
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction & 1)
{
@ -757,7 +757,7 @@ static void paint_river_rapids_track_rapids(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 11 }, { 0, 27, height + 17 });
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction & 1)
{
@ -818,7 +818,7 @@ static void paint_river_rapids_track_whirlpool(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 3 }, { 0, 27, height + 17 });
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction & 1)
{

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

@ -484,7 +484,7 @@ static void paint_splash_boats_track_25_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 9 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -509,7 +509,7 @@ static void paint_splash_boats_track_60_deg_up(
session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 21 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -533,7 +533,7 @@ static void paint_splash_boats_track_flat_to_25_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 1 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -557,7 +557,7 @@ static void paint_splash_boats_track_25_deg_up_to_flat(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 5 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -582,7 +582,7 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(
session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 13 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -607,7 +607,7 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(
session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 66 }, { 0, 27, height });
wooden_a_supports_paint_setup(session, (direction & 1), 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 17 + direction, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -632,7 +632,7 @@ static void paint_splash_boats_track_25_deg_down(
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 50 }, { 0, 27, height });
static constexpr const uint8_t specialSupport[] = { 11, 12, 9, 10 };
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, (direction & 1), specialSupport[direction], height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
@ -665,7 +665,7 @@ static void paint_splash_boats_track_flat_to_25_deg_down(
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 34 }, { 0, 27, height });
static constexpr const uint8_t specialSupport[] = { 7, 8, 5, 6 };
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, (direction & 1), specialSupport[direction], height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
@ -705,7 +705,7 @@ static void paint_splash_boats_track_25_deg_down_to_flat(
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height });
static constexpr const uint8_t specialSupport[] = { 3, 4, 1, 2 };
wooden_a_supports_paint_setup(
WoodenASupportsPaintSetup(
session, (direction & 1), specialSupport[direction], height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
@ -749,7 +749,7 @@ static void paint_splash_boats_track_flat(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction & 1)
{
@ -788,7 +788,7 @@ static void paint_splash_boats_station(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 });
}
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_narrow_station_platform(session, ride, direction, height, 7, trackElement);
@ -817,7 +817,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(
{ 1, 0xFF, 4, 2, 0xFF, 4, 0 },
};
uint8_t supportType = supportTypes[direction][trackSequence];
wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (trackSequence)
@ -896,7 +896,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(
{ 1, 0xFF, 3, 5, 0xFF, 3, 0 },
};
uint8_t supportType = supportTypes[direction][trackSequence];
wooden_a_supports_paint_setup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportType, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (trackSequence)
@ -1000,7 +1000,7 @@ static void paint_splash_boats_track_s_bend_left(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;
case 1:
@ -1009,7 +1009,7 @@ static void paint_splash_boats_track_s_bend_left(
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session,
@ -1022,7 +1022,7 @@ static void paint_splash_boats_track_s_bend_left(
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session,
@ -1033,7 +1033,7 @@ static void paint_splash_boats_track_s_bend_left(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;
}
@ -1100,7 +1100,7 @@ static void paint_splash_boats_track_s_bend_right(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;
case 1:
@ -1109,7 +1109,7 @@ static void paint_splash_boats_track_s_bend_right(
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportTypes1[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session,
@ -1122,7 +1122,7 @@ static void paint_splash_boats_track_s_bend_right(
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
wooden_a_supports_paint_setup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, supportTypes2[direction], 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session,
@ -1133,7 +1133,7 @@ static void paint_splash_boats_track_s_bend_right(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
break;
}