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 steel supports

This commit is contained in:
Rik Smeets 2022-10-08 19:29:39 +02:00
parent fd84cc111f
commit 1d557f40ee
41 changed files with 6146 additions and 6739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,7 +785,7 @@ bool WoodenBSupportsPaintSetup(
* @param imageColourFlags (ebp)
* rct2: 0x00663105
*/
bool metal_a_supports_paint_setup(
bool MetalASupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags)
{
support_height* supportSegments = session.SupportSegments;
@ -986,7 +986,7 @@ bool metal_a_supports_paint_setup(
*
* @return (Carry Flag)
*/
bool metal_b_supports_paint_setup(
bool MetalBSupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags)
{
support_height* supportSegments = session.SupportSegments;

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

@ -21,9 +21,9 @@ bool WoodenASupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate);
bool WoodenBSupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate);
bool metal_a_supports_paint_setup(
bool MetalASupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags);
bool metal_b_supports_paint_setup(
bool MetalBSupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags);
bool path_a_supports_paint_setup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate,

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

@ -939,13 +939,13 @@ void track_paint_util_draw_station_metal_supports_2(
{
if (direction & 1)
{
metal_a_supports_paint_setup(session, type, 6, 0, height, colour);
metal_a_supports_paint_setup(session, type, 7, 0, height, colour);
MetalASupportsPaintSetup(session, type, 6, 0, height, colour);
MetalASupportsPaintSetup(session, type, 7, 0, height, colour);
}
else
{
metal_a_supports_paint_setup(session, type, 5, 0, height, colour);
metal_a_supports_paint_setup(session, type, 8, 0, height, colour);
MetalASupportsPaintSetup(session, type, 5, 0, height, colour);
MetalASupportsPaintSetup(session, type, 8, 0, height, colour);
}
}
@ -2160,7 +2160,7 @@ void track_paint_util_left_corkscrew_up_supports(paint_session& session, Directi
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
0);
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction != 2)
{
PaintUtilSetSegmentSupportHeight(

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

File diff suppressed because it is too large Load Diff

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

@ -60,7 +60,7 @@ static void bobsleigh_rc_track_flat(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
else
@ -88,7 +88,7 @@ static void bobsleigh_rc_track_flat(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -165,7 +165,7 @@ static void bobsleigh_rc_track_25_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
else
@ -207,7 +207,7 @@ static void bobsleigh_rc_track_25_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
if (direction == 0 || direction == 3)
@ -267,7 +267,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
else
@ -309,7 +309,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
if (direction == 0 || direction == 3)
@ -369,7 +369,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
else
@ -411,7 +411,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
if (direction == 0 || direction == 3)
@ -494,7 +494,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -669,7 +669,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
{ 30, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -737,7 +737,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -787,7 +787,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -837,7 +837,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -887,7 +887,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -938,7 +938,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -1113,7 +1113,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -1181,7 +1181,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -1238,7 +1238,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -1295,7 +1295,7 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -1352,7 +1352,7 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -1441,7 +1441,7 @@ static void bobsleigh_rc_track_left_bank(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -1500,7 +1500,7 @@ static void bobsleigh_rc_track_s_bend_left(
{ 32, 27, 0 }, { 0, 2, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -1519,7 +1519,7 @@ static void bobsleigh_rc_track_s_bend_left(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14843), { 0, 0, height },
{ 32, 26, 0 }, { 0, 0, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
@ -1529,7 +1529,7 @@ static void bobsleigh_rc_track_s_bend_left(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14847), { 0, 0, height },
{ 32, 26, 0 }, { 0, 0, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
@ -1581,7 +1581,7 @@ static void bobsleigh_rc_track_s_bend_left(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14843), { 0, 0, height },
{ 32, 26, 0 }, { 0, 0, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
@ -1591,7 +1591,7 @@ static void bobsleigh_rc_track_s_bend_left(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14847), { 0, 0, height },
{ 32, 26, 0 }, { 0, 0, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1637,7 +1637,7 @@ static void bobsleigh_rc_track_s_bend_left(
{ 32, 27, 0 }, { 0, 2, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 1:
@ -1697,7 +1697,7 @@ static void bobsleigh_rc_track_s_bend_right(
{ 32, 27, 0 }, { 0, 2, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -1716,7 +1716,7 @@ static void bobsleigh_rc_track_s_bend_right(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14851), { 0, 0, height },
{ 32, 26, 0 }, { 0, 6, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
@ -1726,7 +1726,7 @@ static void bobsleigh_rc_track_s_bend_right(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14855), { 0, 0, height },
{ 32, 26, 0 }, { 0, 6, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
@ -1778,7 +1778,7 @@ static void bobsleigh_rc_track_s_bend_right(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14851), { 0, 0, height },
{ 32, 26, 0 }, { 0, 6, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
@ -1788,7 +1788,7 @@ static void bobsleigh_rc_track_s_bend_right(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14855), { 0, 0, height },
{ 32, 26, 0 }, { 0, 6, height + 27 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1834,7 +1834,7 @@ static void bobsleigh_rc_track_s_bend_right(
{ 32, 27, 0 }, { 0, 2, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 1:
@ -1894,7 +1894,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -1982,7 +1982,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -2051,7 +2051,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -2139,7 +2139,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -2208,7 +2208,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -2297,7 +2297,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -2348,7 +2348,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 0:
@ -2442,7 +2442,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
@ -2498,7 +2498,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -2587,7 +2587,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 0:
@ -2638,7 +2638,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 2, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -2732,7 +2732,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
@ -2817,7 +2817,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -2993,7 +2993,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -3044,7 +3044,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 0:
@ -3225,7 +3225,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
@ -3281,7 +3281,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -3457,7 +3457,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 0:
@ -3508,7 +3508,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
{ 20, 32, 0 }, { 6, 0, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 1, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 2:
@ -3689,7 +3689,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
{ 32, 20, 0 }, { 0, 6, height + 27 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 7, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_0);
@ -3759,7 +3759,7 @@ static void bobsleigh_rc_track_brakes(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -3798,7 +3798,7 @@ static void bobsleigh_rc_track_block_brakes(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -3815,8 +3815,8 @@ static void bobsleigh_rc_track_on_ride_photo(
case 0:
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height }, { 32, 32, 1 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14572), { 0, 0, height }, { 32, 20, 0 },
{ 0, 6, height + 3 });
@ -3827,8 +3827,8 @@ static void bobsleigh_rc_track_on_ride_photo(
case 1:
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height }, { 32, 32, 1 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14573), { 0, 0, height }, { 32, 20, 0 },
{ 0, 6, height + 3 });
@ -3839,8 +3839,8 @@ static void bobsleigh_rc_track_on_ride_photo(
case 2:
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height }, { 32, 32, 1 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14572), { 0, 0, height }, { 32, 20, 0 },
{ 0, 6, height + 3 });
@ -3852,8 +3852,8 @@ static void bobsleigh_rc_track_on_ride_photo(
case 3:
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height }, { 32, 32, 1 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(14573), { 0, 0, height }, { 32, 20, 0 },
{ 0, 6, height + 3 });

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -72,7 +72,7 @@ static void inverted_hairpin_rc_track_flat(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -173,19 +173,19 @@ static void inverted_hairpin_rc_track_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -337,19 +337,19 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 40, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 40, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 40, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 40, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -525,19 +525,19 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -619,19 +619,19 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -731,7 +731,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
@ -799,7 +799,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
@ -860,7 +860,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
@ -903,7 +903,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
@ -955,7 +955,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
@ -998,7 +998,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
@ -1066,8 +1066,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1250,19 +1249,19 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1319,7 +1318,7 @@ static void inverted_hairpin_rc_track_brakes(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1352,7 +1351,7 @@ static void inverted_hairpin_rc_track_block_brakes(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
}

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

@ -43,7 +43,7 @@ static void inverted_impulse_rc_track_flat(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -115,19 +115,19 @@ static void inverted_impulse_rc_track_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -219,19 +219,19 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -375,19 +375,19 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

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

File diff suppressed because it is too large Load Diff

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

@ -1853,7 +1853,7 @@ void junior_rc_paint_track_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1888,8 +1888,8 @@ void junior_rc_paint_station(
}
PaintAddImageAsChild(session, imageId, { 0, 6, height }, { 32, 20, 1 }, { 0, 0, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
@ -1910,8 +1910,8 @@ void junior_rc_paint_station(
}
PaintAddImageAsChild(session, imageId, { 6, 0, height }, { 20, 32, 1 }, { 0, 0, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
}
@ -1936,7 +1936,7 @@ void junior_rc_paint_track_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t supportType = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, supportType, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -1965,7 +1965,7 @@ void junior_rc_paint_track_flat_to_25_deg_up(
{
int32_t supportType = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
uint16_t ax = (direction == 0) ? 5 : 3;
metal_a_supports_paint_setup(session, supportType, 4, ax, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, supportType, 4, ax, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -2006,7 +2006,7 @@ void junior_rc_paint_track_25_deg_up_to_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t supportType = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, supportType, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, supportType, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -2034,12 +2034,12 @@ static void junior_rc_right_quarter_turn_5_tiles_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, supportHeight,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 6:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 0, supportHeight,
session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2149,7 +2149,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -2197,7 +2197,7 @@ static void junior_rc_flat_to_right_bank_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -2311,12 +2311,12 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, supportHeight,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 6:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 0, supportHeight,
session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2419,7 +2419,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (direction)
@ -2479,7 +2479,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (direction)
@ -2556,7 +2556,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -2617,7 +2617,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -2705,7 +2705,7 @@ static void junior_rc_left_bank_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -2736,12 +2736,12 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4,
(direction == 0 || direction == 3) ? 10 : 8, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 6:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, supportSpecial[direction], height,
session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2814,12 +2814,12 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, supportSpecial[direction], height,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 6:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 8, height,
session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -2968,13 +2968,13 @@ static void junior_rc_s_bend_left_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -2988,16 +2988,13 @@ static void junior_rc_s_bend_left_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -3070,13 +3067,13 @@ static void junior_rc_s_bend_right_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -3090,16 +3087,13 @@ static void junior_rc_s_bend_right_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -3144,7 +3138,7 @@ static void junior_rc_right_quarter_turn_3_tiles_paint_setup(
{
case 0:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, supportType[(direction & 1)][trackSequence], 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3259,7 +3253,7 @@ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(
{
case 0:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, supportType[(direction & 1)][trackSequence], 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3341,7 +3335,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(
{
case 0:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, supportType[(direction & 1)][trackSequence], 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3424,7 +3418,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(
{
case 0:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, supportType[(direction & 1)][trackSequence], 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3526,13 +3520,13 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(
if (trackSequence == 0)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 2, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
else if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 6, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -3594,13 +3588,13 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(
if (trackSequence == 0)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 6, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
else if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 2, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -3694,13 +3688,13 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(
if (trackSequence == 0)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 1, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
else if (trackSequence == 6)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 7, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -3778,13 +3772,13 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(
if (trackSequence == 0)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 7, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
else if (trackSequence == 6)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 1, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -3900,7 +3894,7 @@ static void junior_rc_brake_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -3936,7 +3930,7 @@ static void junior_rc_block_brake_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
int32_t edi = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, edi, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -3957,21 +3951,19 @@ static void junior_rc_left_eighth_to_diag_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 4:
if (direction == 0)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4021,21 +4013,19 @@ static void junior_rc_right_eighth_to_diag_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 4:
if (direction == 0)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4186,21 +4176,19 @@ static void junior_rc_left_eighth_to_diag_bank_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 4:
if (direction == 0)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4331,21 +4319,19 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 4:
if (direction == 0)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4426,7 +4412,7 @@ void junior_rc_paint_track_diag_flat(
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4446,7 +4432,7 @@ void junior_rc_paint_track_diag_25_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4467,7 +4453,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4491,7 +4477,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height + 6, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4512,7 +4498,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_flat(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4536,7 +4522,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_flat(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height + 13, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4557,7 +4543,7 @@ void junior_rc_paint_track_diag_25_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4578,7 +4564,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4602,7 +4588,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height + 7, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4623,7 +4609,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_flat(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4647,7 +4633,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_flat(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4791,7 +4777,7 @@ static void junior_rc_diag_flat_to_left_bank_paint_setup(
}
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4818,7 +4804,7 @@ static void junior_rc_diag_flat_to_right_bank_paint_setup(
}
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4845,7 +4831,7 @@ static void junior_rc_diag_left_bank_to_flat_paint_setup(
}
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4872,7 +4858,7 @@ static void junior_rc_diag_right_bank_to_flat_paint_setup(
}
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4899,7 +4885,7 @@ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4926,7 +4912,7 @@ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4953,7 +4939,7 @@ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -4980,7 +4966,7 @@ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5007,7 +4993,7 @@ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5034,7 +5020,7 @@ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5061,7 +5047,7 @@ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5088,7 +5074,7 @@ static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(
}
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5125,7 +5111,7 @@ static void junior_rc_diag_left_bank_paint_setup(
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5148,7 +5134,7 @@ static void junior_rc_diag_right_bank_paint_setup(
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5217,7 +5203,7 @@ void junior_rc_paint_track_60_deg_up(
static constexpr int8_t support[4] = { 35, 29, 25, 32 };
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5309,7 +5295,7 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(
static constexpr int8_t support[4] = { 12, 12, 12, 14 };
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5379,7 +5365,7 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5416,7 +5402,7 @@ void junior_rc_paint_track_diag_60_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
36, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5437,7 +5423,7 @@ void junior_rc_paint_track_diag_60_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
28, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5458,7 +5444,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
16, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5490,7 +5476,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
21, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5522,7 +5508,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
17, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5543,7 +5529,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5691,7 +5677,7 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(
static constexpr int8_t support[4] = { 12, 12, 12, 14 };
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height - 7,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5750,7 +5736,7 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height - 5,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -5867,7 +5853,7 @@ static void junior_rc_booster_paint_setup(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
uint8_t supportType = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, supportType, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -5888,9 +5874,9 @@ static void junior_rc_track_on_ride_photo(
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height + photoCameraOffset },
{ 32, 32, 1 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
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 });
break;
@ -5898,9 +5884,9 @@ static void junior_rc_track_on_ride_photo(
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height + photoCameraOffset },
{ 32, 32, 1 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
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 });
break;
@ -5908,9 +5894,9 @@ static void junior_rc_track_on_ride_photo(
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height + photoCameraOffset },
{ 32, 32, 1 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
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 });
break;
@ -5918,9 +5904,9 @@ static void junior_rc_track_on_ride_photo(
PaintAddImageAsParentRotated(
session, direction, ImageId(SPR_STATION_BASE_D, COLOUR_BLACK), { 0, 0, height + photoCameraOffset },
{ 32, 32, 1 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
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 });
break;

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -68,12 +68,12 @@ static void mini_suspended_rc_track_flat(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -176,19 +176,19 @@ static void mini_suspended_rc_track_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 6, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 8, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 7, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 5, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -270,19 +270,19 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 6, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 8, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 7, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 5, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -364,19 +364,19 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 6, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 8, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 7, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 5, 0, height + 38, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -456,12 +456,12 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -598,12 +598,12 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -669,12 +669,12 @@ static void mini_suspended_rc_track_s_bend_left(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -717,11 +717,11 @@ static void mini_suspended_rc_track_s_bend_left(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 5, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 6, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -760,11 +760,11 @@ static void mini_suspended_rc_track_s_bend_left(
switch (direction)
{
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 5, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 6, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -802,12 +802,12 @@ static void mini_suspended_rc_track_s_bend_left(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -864,12 +864,12 @@ static void mini_suspended_rc_track_s_bend_right(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -912,11 +912,11 @@ static void mini_suspended_rc_track_s_bend_right(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 8, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 7, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -955,11 +955,11 @@ static void mini_suspended_rc_track_s_bend_right(
switch (direction)
{
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 8, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 7, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -997,12 +997,12 @@ static void mini_suspended_rc_track_s_bend_right(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1060,12 +1060,12 @@ static void mini_suspended_rc_track_left_quarter_turn_3(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1139,12 +1139,12 @@ static void mini_suspended_rc_track_left_quarter_turn_3(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1210,12 +1210,12 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1323,19 +1323,19 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 3, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 1, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 0, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 2, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1383,12 +1383,12 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
{
case 0:
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1496,19 +1496,19 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1653,19 +1653,19 @@ static void mini_suspended_rc_track_diag_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 30, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1792,19 +1792,19 @@ static void mini_suspended_rc_track_diag_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1931,19 +1931,19 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -2070,19 +2070,19 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -2209,19 +2209,19 @@ static void mini_suspended_rc_track_diag_25_deg_down(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -2345,19 +2345,19 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 36, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -2484,19 +2484,19 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 1, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 0, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK, 2, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_FORK_ALT, 3, 0, height + 34, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -64,7 +64,7 @@ static void suspended_swinging_rc_track_flat(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
@ -164,19 +164,19 @@ static void suspended_swinging_rc_track_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height + 62, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -299,19 +299,19 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -452,19 +452,19 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 0, height + 76, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height + 76, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height + 76, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height + 76, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -546,19 +546,19 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -658,8 +658,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -789,8 +788,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -850,8 +848,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -981,8 +978,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1033,8 +1029,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1164,8 +1159,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1235,8 +1229,7 @@ static void suspended_swinging_rc_track_s_bend_left(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1276,11 +1269,11 @@ static void suspended_swinging_rc_track_s_bend_left(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1319,11 +1312,11 @@ static void suspended_swinging_rc_track_s_bend_left(
switch (direction)
{
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 6, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1357,8 +1350,7 @@ static void suspended_swinging_rc_track_s_bend_left(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1408,8 +1400,7 @@ static void suspended_swinging_rc_track_s_bend_right(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1449,11 +1440,11 @@ static void suspended_swinging_rc_track_s_bend_right(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1492,11 +1483,11 @@ static void suspended_swinging_rc_track_s_bend_right(
switch (direction)
{
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 7, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1530,8 +1521,7 @@ static void suspended_swinging_rc_track_s_bend_right(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1582,8 +1572,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1650,8 +1639,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1711,8 +1699,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1754,8 +1741,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1806,8 +1792,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1849,8 +1834,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -1911,7 +1895,7 @@ static void suspended_swinging_rc_track_brakes(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);
@ -1953,8 +1937,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -2084,8 +2067,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -2136,8 +2118,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -2267,8 +2248,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -2319,8 +2299,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -2450,8 +2429,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -2502,8 +2480,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -2633,8 +2610,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -2684,8 +2660,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -2790,19 +2765,19 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -2846,8 +2821,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -2952,19 +2926,19 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3109,19 +3083,19 @@ static void suspended_swinging_rc_track_diag_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3248,19 +3222,19 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3331,19 +3305,19 @@ static void suspended_swinging_rc_track_diag_60_deg_up(
switch (direction)
{
case 0:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 32, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 36, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 32, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 36, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3470,19 +3444,19 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3553,19 +3527,19 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(
switch (direction)
{
case 0:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 16, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 16, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 16, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 16, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3636,19 +3610,19 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(
switch (direction)
{
case 0:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 21, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 21, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 21, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 21, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3775,19 +3749,19 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3914,19 +3888,19 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 56, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4112,19 +4086,19 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4195,19 +4169,19 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(
switch (direction)
{
case 0:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 17, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 17, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 17, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 17, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4278,19 +4252,19 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(
switch (direction)
{
case 0:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 8, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 8, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 8, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 8, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4417,19 +4391,19 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 1, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 0, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 2, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 3, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -4464,7 +4438,7 @@ static void suspended_swinging_rc_track_block_brakes(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_INVERTED_3);

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

@ -180,7 +180,7 @@ static void wild_mouse_track_flat(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -241,7 +241,7 @@ static void wild_mouse_track_25_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -282,11 +282,11 @@ static void wild_mouse_track_60_deg_up(
{
if (direction == 0 || direction == 3)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -33, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -33, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
if (direction == 0 || direction == 3)
@ -319,7 +319,7 @@ static void wild_mouse_track_flat_to_25_deg_up(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -4, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -366,7 +366,7 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -13, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -13, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -413,7 +413,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -21, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -21, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -445,7 +445,7 @@ static void wild_mouse_track_25_deg_up_to_flat(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -7, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -7, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -543,7 +543,7 @@ static void wild_mouse_track_right_quarter_turn_3(
{
case 0:
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -605,7 +605,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(
{
case 0:
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -670,18 +670,16 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
if (direction == 2)
{
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, -11, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -11, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
}
break;
}
@ -745,7 +743,7 @@ static void wild_mouse_track_left_quarter_turn_1(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 24, 24, 2 }, { 6, 6, height });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -1, 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, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
@ -792,7 +790,7 @@ static void wild_mouse_track_flat_to_60_deg_up(
}
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -5, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -5, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
@ -841,11 +839,11 @@ static void wild_mouse_track_60_deg_up_to_flat(
{
if (direction == 0 || direction == 3)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, -17, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, -17, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
}
}
if (direction == 0 || direction == 3)
@ -886,7 +884,7 @@ static void wild_mouse_track_brakes(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -910,7 +908,7 @@ static void wild_mouse_track_rotation_control_toggle(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(
@ -928,7 +926,7 @@ static void wild_mouse_track_block_brakes(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height });
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(

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

@ -3363,7 +3363,7 @@ static void wooden_rc_track_left_vertical_loop(
{ 32, 20, 7 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
@ -3381,28 +3381,28 @@ static void wooden_rc_track_left_vertical_loop(
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23454), { 0, 0, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23462), { 0, 14, height },
{ 32, 2, 63 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23459), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23467), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3541,28 +3541,28 @@ static void wooden_rc_track_left_vertical_loop(
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23459), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23467), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23454), { 0, 0, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23462), { 0, 14, height },
{ 32, 2, 63 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3596,7 +3596,7 @@ static void wooden_rc_track_left_vertical_loop(
{ 32, 20, 3 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 1:
@ -3647,7 +3647,7 @@ static void wooden_rc_track_right_vertical_loop(
{ 32, 20, 3 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
@ -3661,28 +3661,28 @@ static void wooden_rc_track_right_vertical_loop(
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23483), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23475), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23478), { 0, 14, height },
{ 32, 2, 63 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23470), { 0, 0, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3805,28 +3805,28 @@ static void wooden_rc_track_right_vertical_loop(
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23478), { 0, 14, height },
{ 32, 2, 63 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 9, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23470), { 0, 0, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23483), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, wooden_rc_get_rails_colour(session).WithIndex(23475), { 0, 6, height },
{ 32, 26, 3 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 4, 16, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -3856,7 +3856,7 @@ static void wooden_rc_track_right_vertical_loop(
{ 32, 20, 3 });
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
case 1:

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

@ -180,7 +180,7 @@ static void PaintCarRideTrackFlat(
PaintUtilPushTunnelRight(session, height, TUNNEL_0);
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
@ -218,7 +218,7 @@ static void PaintCarRideTrack25DegUp(
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
@ -256,7 +256,7 @@ static void PaintCarRideTrackFlatTo25DegUp(
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
@ -294,7 +294,7 @@ static void PaintCarRideTrack25DegUpToFlat(
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 40, 0x20);
@ -363,13 +363,13 @@ static void PaintCarRideStation(
if (direction == 0 || direction == 2)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
track_paint_util_draw_station(session, ride, direction, height, trackElement);
@ -392,7 +392,7 @@ static void PaintCarRideTrackRightQuarterTurn3Tiles(
{
case 0:
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -446,7 +446,7 @@ static void PaintCarRideTrackLeftQuarterTurn1Tile(
break;
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, 0, TUNNEL_0, 0, TUNNEL_0);
@ -536,7 +536,7 @@ static void PaintCarRideTrack60DegUp(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -592,7 +592,7 @@ static void PaintCarRideTrack25DegUpTo60DegUp(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -648,7 +648,7 @@ static void PaintCarRideTrack60DegUpTo25DegUp(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -705,7 +705,7 @@ static void PaintCarRideTrackLogBumps(
PaintUtilPushTunnelRight(session, height, TUNNEL_0);
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);

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

@ -189,7 +189,7 @@ static void PaintGhostTrainTrackFlat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -210,7 +210,7 @@ static void PaintGhostTrainTrack25DegUp(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (direction)
@ -258,7 +258,7 @@ static void PaintGhostTrainTrackFlatTo25DegUp(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (direction)
@ -294,7 +294,7 @@ static void PaintGhostTrainTrack25DegUpToFlatShared(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -390,13 +390,13 @@ static void PaintGhostTrainStation(
if (direction == 0 || direction == 2)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
track_paint_util_draw_station(session, ride, direction, height, trackElement);
@ -424,7 +424,7 @@ static void PaintGhostTrainTrackRightQuarterTurn3Tiles(
{
case 0:
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -477,7 +477,7 @@ static void PaintGhostTrainTrackLeftQuarterTurn1Tile(
session, 3, height, 0, direction, session.TrackColours[SCHEME_TRACK], GhostTrainTrackPiecesQuarterTurn1Tile);
track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, 0, tunnelStartImage, 0, tunnelEndImage);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -524,7 +524,7 @@ static void PaintGhostTrainTrackBrakes(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(

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

@ -502,7 +502,7 @@ static void PaintMiniGolfTrackFlat(
PaintUtilPushTunnelLeft(session, height, TUNNEL_PATH_AND_MINI_GOLF);
}
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -539,7 +539,7 @@ static void PaintMiniGolfTrack25DegUp(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(MiniGolfTrackSprites25DegUp[direction][0]);
MiniGolfPaintUtil7C(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, session.CurrentRotation);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -578,7 +578,7 @@ static void PaintMiniGolfTrackFlatTo25DegUp(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(MiniGolfTrackSpritesFlatTo25DegUp[direction][0]);
MiniGolfPaintUtil7C(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, session.CurrentRotation);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -617,7 +617,7 @@ static void PaintMiniGolfTrack25DegUpToFlat(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(MiniGolfTrackSprites25DegUpToFlat[direction][0]);
MiniGolfPaintUtil7C(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, session.CurrentRotation);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -742,7 +742,7 @@ static void PaintMiniGolfTrackLeftQuarterTurn1Tile(
track_paint_util_left_quarter_turn_1_tile_paint(
session, 1, height, 0, direction, session.TrackColours[SCHEME_TRACK], MiniGolfTrackSpritesQuarterTurn1Tile);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0, direction), 0xFFFF, 0);

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

@ -31,8 +31,8 @@ static void PaintMiniHelicoptersTrackStation(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 0, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
@ -43,8 +43,8 @@ static void PaintMiniHelicoptersTrackStation(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { 20, 32, 1 }, { 0, 0, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
}
@ -76,7 +76,7 @@ static void PaintMiniHelicoptersTrackFlat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, -1, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -123,7 +123,7 @@ static void PaintMiniHelicoptersTrackFlatTo25DegUp(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, -4, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -4, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -164,7 +164,7 @@ static void PaintMiniHelicoptersTrack25DegUp(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -9, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -209,7 +209,7 @@ static void PaintMiniHelicoptersTrack25DegUpToFlat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, -7, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -7, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -254,7 +254,7 @@ static void PaintMiniHelicoptersTrackLeftQuarterTurn3Tiles(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0);
break;
@ -263,7 +263,7 @@ static void PaintMiniHelicoptersTrackLeftQuarterTurn3Tiles(
session, PaintUtilRotateSegments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0);
break;
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0);
break;

63
src/openrct2/ride/gentle/MonorailCycles.cpp
View File

@ -194,7 +194,7 @@ static void PaintMonorailCyclesTrackFlat(
PaintUtilPushTunnelLeft(session, height, TUNNEL_0);
}
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, -1, height,
session.TrackColours[SCHEME_SUPPORTS]);
@ -218,8 +218,8 @@ static void PaintMonorailCyclesStation(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SprMonorailCyclesFlatSwNe);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { 32, 20, 1 }, { 0, 0, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelLeft(session, height, TUNNEL_SQUARE_FLAT);
}
else if (direction == 1 || direction == 3)
@ -230,8 +230,8 @@ static void PaintMonorailCyclesStation(
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SprMonorailCyclesFlatNwSe);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { 20, 32, 1 }, { 0, 0, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRight(session, height, TUNNEL_SQUARE_FLAT);
}
@ -254,7 +254,7 @@ static void PaintMonorailCyclesTrackLeftQuarterTurn3Tiles(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0);
break;
@ -263,7 +263,7 @@ static void PaintMonorailCyclesTrackLeftQuarterTurn3Tiles(
session, PaintUtilRotateSegments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0);
break;
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -1, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0);
break;
@ -317,48 +317,48 @@ static void PaintMonorailCyclesTrackRightQuarterTurn5Tiles(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, supportSpecial, supportHeight,
session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
if (direction == 0)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 8, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 7, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 5, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 6, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 5:
if (direction == 0)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 7, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 5, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 6, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 8, supportSpecial,
supportHeight, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 6:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 4, supportSpecial, supportHeight,
session.TrackColours[SCHEME_SUPPORTS]);
break;
@ -466,16 +466,13 @@ static void PaintMonorailCyclesTrackSBendLeft(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -489,15 +486,15 @@ static void PaintMonorailCyclesTrackSBendLeft(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height - 2, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -573,16 +570,14 @@ static void PaintMonorailCyclesTrackSBendRight(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK, 8, 0, height - 2, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -596,15 +591,15 @@ static void PaintMonorailCyclesTrackSBendRight(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

12
src/openrct2/ride/thrill/MagicCarpet.cpp
View File

@ -222,17 +222,13 @@ static void PaintMagicCarpet(
case 2:
if (direction & 1)
{
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
const StationObject* stationObject = ride.GetStationObject();

8
src/openrct2/ride/thrill/SwingingInverterShip.cpp
View File

@ -137,13 +137,13 @@ static void PaintSwingingInverterShip(
{
if (direction & 1)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))

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

@ -167,8 +167,8 @@ static void PaintSwingingShip(
}
else if (direction & 1)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
{
@ -178,8 +178,8 @@ static void PaintSwingingShip(
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
{

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

@ -86,7 +86,7 @@ static void chairlift_paint_util_draw_supports(paint_session& session, int32_t s
continue;
}
if (metal_a_supports_paint_setup(session, METAL_SUPPORTS_TRUSS, s, 0, height, session.TrackColours[SCHEME_SUPPORTS]))
if (MetalASupportsPaintSetup(session, METAL_SUPPORTS_TRUSS, s, 0, height, session.TrackColours[SCHEME_SUPPORTS]))
{
success = true;
}
@ -106,7 +106,7 @@ static void chairlift_paint_util_draw_supports(paint_session& session, int32_t s
}
uint16_t temp = supportSegments[s].height;
supportSegments[s].height = session.Support.height;
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TRUSS, s, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TRUSS, s, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
supportSegments[s].height = temp;
}
}

98
src/openrct2/ride/transport/Monorail.cpp
View File

@ -410,7 +410,7 @@ static void paint_monorail_track_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -463,13 +463,13 @@ static void paint_monorail_station(
if (direction == 0 || direction == 2)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
track_paint_util_draw_station(session, ride, direction, height, trackElement);
@ -512,7 +512,7 @@ static void paint_monorail_track_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -554,7 +554,7 @@ static void paint_monorail_track_flat_to_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -596,7 +596,7 @@ static void paint_monorail_track_25_deg_up_to_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -642,7 +642,7 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(
{
case 0:
case 6:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -740,16 +740,13 @@ static void paint_monorail_track_s_bend_left(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -763,16 +760,13 @@ static void paint_monorail_track_s_bend_left(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -835,16 +829,13 @@ static void paint_monorail_track_s_bend_right(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -858,16 +849,13 @@ static void paint_monorail_track_s_bend_right(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
}
@ -908,7 +896,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(
{
case 0:
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -961,21 +949,17 @@ static void paint_monorail_track_left_eighth_to_diag(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 4:
if (direction == 0)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1030,21 +1014,17 @@ static void paint_monorail_track_right_eighth_to_diag(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 4:
if (direction == 0)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 1)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 0, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 2)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 2, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 3)
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 3, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1135,7 +1115,7 @@ static void paint_monorail_track_diag_flat(
if (trackSequence == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1158,7 +1138,7 @@ static void paint_monorail_track_diag_25_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1181,7 +1161,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_up(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1204,7 +1184,7 @@ static void paint_monorail_track_diag_25_deg_up_to_flat(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1227,7 +1207,7 @@ static void paint_monorail_track_diag_25_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1251,7 +1231,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_down(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1275,7 +1255,7 @@ static void paint_monorail_track_diag_25_deg_down_to_flat(
if (trackSequence == 3)
{
metal_b_supports_paint_setup(
MetalBSupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height,
session.TrackColours[SCHEME_SUPPORTS]);
}

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

@ -44,7 +44,7 @@ static void suspended_monorail_track_flat(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_INVERTED_9);
@ -115,19 +115,19 @@ static void suspended_monorail_track_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 6, 0, height + 60, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 8, 0, height + 60, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 7, 0, height + 60, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 5, 0, height + 60, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -180,19 +180,19 @@ static void suspended_monorail_track_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 6, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 8, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 7, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 5, 0, height + 52, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -245,19 +245,19 @@ static void suspended_monorail_track_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 6, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 8, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 7, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 5, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -333,8 +333,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -464,8 +463,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -524,8 +522,7 @@ static void suspended_monorail_track_s_bend_left(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -565,11 +562,11 @@ static void suspended_monorail_track_s_bend_left(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 5, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 6, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -608,11 +605,11 @@ static void suspended_monorail_track_s_bend_left(
switch (direction)
{
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 5, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 6, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -646,8 +643,7 @@ static void suspended_monorail_track_s_bend_left(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -697,8 +693,7 @@ static void suspended_monorail_track_s_bend_right(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -738,11 +733,11 @@ static void suspended_monorail_track_s_bend_right(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 8, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 7, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -781,11 +776,11 @@ static void suspended_monorail_track_s_bend_right(
switch (direction)
{
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 8, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 7, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -819,8 +814,7 @@ static void suspended_monorail_track_s_bend_right(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -871,8 +865,7 @@ static void suspended_monorail_track_left_quarter_turn_3(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -939,8 +932,7 @@ static void suspended_monorail_track_left_quarter_turn_3(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
switch (direction)
{
@ -999,8 +991,7 @@ static void suspended_monorail_track_left_eighth_to_diag(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1104,19 +1095,19 @@ static void suspended_monorail_track_left_eighth_to_diag(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1160,8 +1151,7 @@ static void suspended_monorail_track_right_eighth_to_diag(
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3)
{
@ -1265,19 +1255,19 @@ static void suspended_monorail_track_right_eighth_to_diag(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1366,19 +1356,19 @@ static void suspended_monorail_track_diag_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 42, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1449,19 +1439,19 @@ static void suspended_monorail_track_diag_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 55, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 55, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 55, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 57, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1532,19 +1522,19 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 50, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1615,19 +1605,19 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 51, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 51, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 51, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 51, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1698,19 +1688,19 @@ static void suspended_monorail_track_diag_25_deg_down(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 54, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 51, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 58, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1778,19 +1768,19 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 48, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1861,19 +1851,19 @@ static void suspended_monorail_track_diag_25_deg_down_to_flat(
switch (direction)
{
case 0:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 1, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 0, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 2, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 3, 0, height + 46, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

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

@ -376,7 +376,7 @@ static void dinghy_slide_track_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -404,9 +404,9 @@ static void dinghy_slide_track_station(
session, direction, session.TrackColours[SCHEME_MISC].WithIndex(imageIds[direction][1]), { 0, 0, height },
{ 32, 32, 1 });
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(session, ride, direction, height, trackElement);
@ -445,7 +445,7 @@ static void dinghy_slide_track_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -481,7 +481,7 @@ static void dinghy_slide_track_60_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -526,7 +526,7 @@ static void dinghy_slide_track_flat_to_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -562,7 +562,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -598,7 +598,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -643,7 +643,7 @@ static void dinghy_slide_track_25_deg_up_to_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -769,7 +769,7 @@ static void dinghy_slide_track_right_quarter_turn_5(
{
case 0:
case 6:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -877,7 +877,7 @@ static void dinghy_slide_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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;
@ -888,7 +888,7 @@ static void dinghy_slide_track_s_bend_left(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -904,7 +904,7 @@ static void dinghy_slide_track_s_bend_left(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -917,7 +917,7 @@ static void dinghy_slide_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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);
break;
@ -982,7 +982,7 @@ static void dinghy_slide_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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;
@ -993,7 +993,7 @@ static void dinghy_slide_track_s_bend_right(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -1008,7 +1008,7 @@ static void dinghy_slide_track_s_bend_right(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -1020,7 +1020,7 @@ static void dinghy_slide_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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);
break;
@ -1103,7 +1103,7 @@ static void dinghy_slide_track_right_quarter_turn_3(
{
case 0:
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1152,7 +1152,7 @@ static void dinghy_slide_track_flat_covered(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -1181,7 +1181,7 @@ static void dinghy_slide_track_25_deg_up_covered(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -1217,7 +1217,7 @@ static void dinghy_slide_track_60_deg_up_covered(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 32, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -1253,7 +1253,7 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -1289,7 +1289,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 12, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -1325,7 +1325,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 20, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -1361,7 +1361,7 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -1487,7 +1487,7 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(
{
case 0:
case 6:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
@ -1588,7 +1588,7 @@ static void dinghy_slide_track_s_bend_left_covered(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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;
@ -1599,7 +1599,7 @@ static void dinghy_slide_track_s_bend_left_covered(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1615,7 +1615,7 @@ static void dinghy_slide_track_s_bend_left_covered(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -1628,7 +1628,7 @@ static void dinghy_slide_track_s_bend_left_covered(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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);
break;
@ -1693,7 +1693,7 @@ static void dinghy_slide_track_s_bend_right_covered(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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;
@ -1704,7 +1704,7 @@ static void dinghy_slide_track_s_bend_right_covered(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -1719,7 +1719,7 @@ static void dinghy_slide_track_s_bend_right_covered(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -1731,7 +1731,7 @@ static void dinghy_slide_track_s_bend_right_covered(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 27, 2 }, { 0, 2, height });
PaintAddImageAsParentRotated(
session, direction, frontImageId, { 0, 0, height }, { 32, 27, 0 }, { 0, 2, height + 27 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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);
break;
@ -1814,7 +1814,7 @@ static void dinghy_slide_track_right_quarter_turn_3_covered(
{
case 0:
case 3:
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}

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

@ -172,7 +172,7 @@ static void paint_log_flume_track_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
@ -200,13 +200,13 @@ static void paint_log_flume_track_station(
if (direction & 1)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
track_paint_util_draw_station_3(session, ride, direction, height + 2, height, trackElement);
@ -237,7 +237,7 @@ static void paint_log_flume_track_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -272,7 +272,7 @@ static void paint_log_flume_track_flat_to_25_deg_up(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -307,7 +307,7 @@ static void paint_log_flume_track_25_deg_up_to_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -342,7 +342,7 @@ static void paint_log_flume_track_25_deg_down(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -377,7 +377,7 @@ static void paint_log_flume_track_flat_to_25_deg_down(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -412,7 +412,7 @@ static void paint_log_flume_track_25_deg_down_to_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 3, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
@ -469,7 +469,7 @@ static void paint_log_flume_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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;
@ -480,7 +480,7 @@ static void paint_log_flume_track_s_bend_left(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 5 + (direction & 1), (direction & 1), height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -496,7 +496,7 @@ static void paint_log_flume_track_s_bend_left(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 5 + (direction & 1), (direction & 1), height,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -509,7 +509,7 @@ static void paint_log_flume_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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);
break;
@ -574,7 +574,7 @@ static void paint_log_flume_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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;
@ -585,7 +585,7 @@ static void paint_log_flume_track_s_bend_right(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 0 || direction == 1)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 8 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -600,7 +600,7 @@ static void paint_log_flume_track_s_bend_right(
session, direction, frontImageId, { 0, 0, height }, { 32, 26, 0 }, { 0, bboy, height + 27 });
if (direction == 2 || direction == 3)
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, METAL_SUPPORTS_BOXED, 8 - (direction & 1), 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
PaintUtilSetSegmentSupportHeight(
@ -612,7 +612,7 @@ static void paint_log_flume_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 });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
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);
break;
@ -677,7 +677,7 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(
if (trackSequence != 1 && trackSequence != 2)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (trackSequence)
@ -756,7 +756,7 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(
if (trackSequence != 1 && trackSequence != 2)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
}
switch (trackSequence)
@ -802,13 +802,13 @@ static void paint_log_flume_track_on_ride_photo(
if (direction & 1)
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK_ALT, 7, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK_ALT, 7, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
else
{
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 5, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 8, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 5, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_FORK, 8, 6, height, session.TrackColours[SCHEME_SUPPORTS]);
}
auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(LogFlumeTrackFlatImageIds[direction][0]);
@ -841,7 +841,7 @@ static void paint_log_flume_track_reverser(
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 1, 26 }, { 0, 27, height });
metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 0, height, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(

8
src/openrct2/ride/water/SubmarineRide.cpp
View File

@ -116,7 +116,7 @@ static void submarine_ride_paint_track_flat(
if (track_paint_util_should_paint_supports(session.MapPosition))
{
metal_a_supports_paint_setup(
MetalASupportsPaintSetup(
session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, -1, heightLower,
session.TrackColours[SCHEME_SUPPORTS]);
}
@ -138,8 +138,7 @@ static void submarine_ride_paint_track_left_quarter_turn_3_tiles(
switch (trackSequence)
{
case 0:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, -1, height - 16, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -1, height - 16, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0);
break;
@ -148,8 +147,7 @@ static void submarine_ride_paint_track_left_quarter_turn_3_tiles(
session, PaintUtilRotateSegments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0);
break;
case 3:
metal_a_supports_paint_setup(
session, METAL_SUPPORTS_STICK, 4, -1, height - 16, session.TrackColours[SCHEME_SUPPORTS]);
MetalASupportsPaintSetup(session, METAL_SUPPORTS_STICK, 4, -1, height - 16, session.TrackColours[SCHEME_SUPPORTS]);
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0);
break;