From 6421680e4e04fac46d41f7a906d1a0ac9b2efe06 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 17 Nov 2023 23:09:41 +0100 Subject: [PATCH] Further consolidate support calls on the heartline roll --- .../ride/coaster/HeartlineTwisterCoaster.cpp | 102 +++--------------- 1 file changed, 14 insertions(+), 88 deletions(-) diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index b82c44ab7b..5c09ff88c6 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -1239,14 +1239,6 @@ static void HeartlineTwisterRCTrackLeftHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0); - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 1: switch (direction) @@ -1284,13 +1276,6 @@ static void HeartlineTwisterRCTrackLeftHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 2: switch (direction) @@ -1328,13 +1313,6 @@ static void HeartlineTwisterRCTrackLeftHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 3: switch (direction) @@ -1372,13 +1350,6 @@ static void HeartlineTwisterRCTrackLeftHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 4: switch (direction) @@ -1416,13 +1387,6 @@ static void HeartlineTwisterRCTrackLeftHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 5: switch (direction) @@ -1460,16 +1424,15 @@ static void HeartlineTwisterRCTrackLeftHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0); - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; } + + WoodenASupportsPaintSetupRotated( + session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, session.TrackColours[SCHEME_SUPPORTS]); + + PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0); + PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); + PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } /** rct2: 0x00876A5C */ @@ -1515,14 +1478,6 @@ static void HeartlineTwisterRCTrackRightHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0); - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 1: switch (direction) @@ -1560,13 +1515,6 @@ static void HeartlineTwisterRCTrackRightHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 2: switch (direction) @@ -1604,13 +1552,6 @@ static void HeartlineTwisterRCTrackRightHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 3: switch (direction) @@ -1648,13 +1589,6 @@ static void HeartlineTwisterRCTrackRightHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 4: switch (direction) @@ -1692,13 +1626,6 @@ static void HeartlineTwisterRCTrackRightHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; case 5: switch (direction) @@ -1736,16 +1663,15 @@ static void HeartlineTwisterRCTrackRightHeartlineRoll( { { 0, 27, height }, { 32, 1, 26 } }); break; } - - WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, - session.TrackColours[SCHEME_SUPPORTS]); - - PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0); - PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); - PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); break; } + + WoodenASupportsPaintSetupRotated( + session, WoodenSupportType::Mine, WoodenSupportSubType::NeSw, direction, height, session.TrackColours[SCHEME_SUPPORTS]); + + PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_0); + PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); + PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } TRACK_PAINT_FUNCTION GetTrackPaintFunctionHeartlineTwisterRC(int32_t trackType)