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

Clean up metal supports

This commit is contained in:
Michael Steenbeek 2017-01-11 20:23:47 +01:00 committed by GitHub
parent e6dc4f179d
commit 92feea1612
38 changed files with 4977 additions and 4976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/paint/supports.c
View File

@ -117,7 +117,7 @@ const uint32 _97B072[][8] = {
}; };
/** rct2: 0x0097B142 */ /** rct2: 0x0097B142 */
static const uint8 word_97B142[] = { static const uint8 supportTypeToHeight[] = {
6, 6,
3, 3,
3, 3,
@ -705,7 +705,7 @@ bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, int special,
if (height < gSupportSegments[segment].height){ if (height < gSupportSegments[segment].height){
unk9E3294 = height; unk9E3294 = height;
height -= word_97B142[supportType]; height -= supportTypeToHeight[supportType];
if (height < 0) if (height < 0)
return false; return false;
@ -901,7 +901,7 @@ bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, int special,
if (height < gSupportSegments[segment].height) { if (height < gSupportSegments[segment].height) {
_9E3294 = height; _9E3294 = height;
baseHeight -= word_97B142[supportType]; baseHeight -= supportTypeToHeight[supportType];
if (baseHeight < 0) { if (baseHeight < 0) {
return false; // AND return false; // AND
} }

10
src/openrct2/paint/supports.h
View File

@ -35,19 +35,19 @@ bool path_b_supports_paint_setup(int supportType, int special, int height, uint3
// There are 13 types of metal supports. A graphic showing all of them is available here: https://cloud.githubusercontent.com/assets/737603/19420485/7eaba28e-93ec-11e6-83cb-03190accc094.png // There are 13 types of metal supports. A graphic showing all of them is available here: https://cloud.githubusercontent.com/assets/737603/19420485/7eaba28e-93ec-11e6-83cb-03190accc094.png
enum { enum {
METAL_SUPPORTS_TUBES, // Used by the steel twister and other rides METAL_SUPPORTS_TUBES, // Used by the steel twister, looping rc, and other rides
METAL_SUPPORTS_FORK, // Used by the junior RC and other rides METAL_SUPPORTS_FORK, // Used by the junior RC and other rides
METAL_SUPPORTS_FORK_ALT, // Rotated version of METAL_SUPPORTS_FORK METAL_SUPPORTS_FORK_ALT, // Rotated version of METAL_SUPPORTS_FORK
METAL_SUPPORTS_BOXED, // Used by the vertical roller coasters, the log flume and other rides METAL_SUPPORTS_BOXED, // Used by the vertical roller coasters, the log flume and other rides
METAL_SUPPORTS_STICK, // Used by the Steeplechase (or perhaps the _ALT version is used instead) METAL_SUPPORTS_STICK, // Used by the Steeplechase
METAL_SUPPORTS_STICK_ALT, // No visible difference from METAL_SUPPORTS_STICK METAL_SUPPORTS_STICK_ALT, // No visible difference from METAL_SUPPORTS_STICK, also used by the Steeplechase
METAL_SUPPORTS_THICK_CENTRED, // Every THICK type seems to be used for the Looping Roller Coaster's METAL_SUPPORTS_THICK_CENTRED, // Every THICK type seems to be used for the Looping Roller Coaster's
METAL_SUPPORTS_THICK, // loop, and only for that specific part. METAL_SUPPORTS_THICK, // loop, and only for that specific part.
METAL_SUPPORTS_THICK_ALT, METAL_SUPPORTS_THICK_ALT,
METAL_SUPPORTS_THICK_ALT_CENTRED, METAL_SUPPORTS_THICK_ALT_CENTRED,
METAL_SUPPORTS_TRUSS, // Used by the chairlift METAL_SUPPORTS_TRUSS, // Used by the chairlift
METAL_SUPPORTS_TUBES_ALT, // Mostly the same as METAL_SUPPORTS_TUBES, but with a thinner crossbeam METAL_SUPPORTS_TUBES_INVERTED, // Used by inverted rcs like the flying, lay-down, compact inverted. Mostly the same as METAL_SUPPORTS_TUBES, but with a thinner crossbeam.
METAL_SUPPORTS_BOXED_COATED METAL_SUPPORTS_BOXED_COATED // Does not seem to be used in RCT2, but it was used in RCT1 for one of the path support types.
}; };
#endif #endif

110
src/openrct2/ride/coaster/bobsleigh_coaster.c
View File

@ -43,7 +43,7 @@ static void bobsleigh_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} else { } else {
switch (direction) { switch (direction) {
@ -59,7 +59,7 @@ static void bobsleigh_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -108,7 +108,7 @@ static void bobsleigh_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} else { } else {
switch (direction) { switch (direction) {
@ -130,7 +130,7 @@ static void bobsleigh_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -165,7 +165,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} else { } else {
switch (direction) { switch (direction) {
@ -187,7 +187,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -222,7 +222,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} else { } else {
switch (direction) { switch (direction) {
@ -244,7 +244,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -297,7 +297,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14722, 0, 2, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14722, 0, 2, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -395,7 +395,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14718, 2, 0, 30, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14718, 2, 0, 30, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -439,7 +439,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSeq
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -468,7 +468,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSe
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -497,7 +497,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSeq
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -526,7 +526,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSe
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -556,7 +556,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14762, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14762, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -654,7 +654,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14758, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14758, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -698,7 +698,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -731,7 +731,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tr
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -764,7 +764,7 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tra
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0);
@ -797,7 +797,7 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tr
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0);
@ -854,7 +854,7 @@ static void bobsleigh_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, u
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -890,7 +890,7 @@ static void bobsleigh_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14849, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14849, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -902,12 +902,12 @@ static void bobsleigh_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
case 0: case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14827, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14827, 0, 0, 32, 26, 2, height, 0, 0, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14843, 0, 0, 32, 26, 0, height, 0, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14843, 0, 0, 32, 26, 0, height, 0, 0, height + 27);
metal_a_supports_paint_setup(0, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14831, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14831, 0, 0, 32, 26, 2, height, 0, 0, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14847, 0, 0, 32, 26, 0, height, 0, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14847, 0, 0, 32, 26, 0, height, 0, 0, height + 27);
metal_a_supports_paint_setup(0, 6, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14828, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14828, 0, 0, 32, 26, 2, height, 0, 6, height);
@ -934,12 +934,12 @@ static void bobsleigh_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14827, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14827, 0, 0, 32, 26, 2, height, 0, 0, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14843, 0, 0, 32, 26, 0, height, 0, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14843, 0, 0, 32, 26, 0, height, 0, 0, height + 27);
metal_a_supports_paint_setup(0, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14831, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14831, 0, 0, 32, 26, 2, height, 0, 0, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14847, 0, 0, 32, 26, 0, height, 0, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14847, 0, 0, 32, 26, 0, height, 0, 0, height + 27);
metal_a_supports_paint_setup(0, 6, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -964,7 +964,7 @@ static void bobsleigh_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14846, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14846, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -1002,7 +1002,7 @@ static void bobsleigh_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14857, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14857, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -1014,12 +1014,12 @@ static void bobsleigh_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
case 0: case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14835, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14835, 0, 0, 32, 26, 2, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14851, 0, 0, 32, 26, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14851, 0, 0, 32, 26, 0, height, 0, 6, height + 27);
metal_a_supports_paint_setup(0, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14839, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14839, 0, 0, 32, 26, 2, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14855, 0, 0, 32, 26, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14855, 0, 0, 32, 26, 0, height, 0, 6, height + 27);
metal_a_supports_paint_setup(0, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14836, 0, 0, 32, 26, 2, height, 0, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14836, 0, 0, 32, 26, 2, height, 0, 0, height);
@ -1046,12 +1046,12 @@ static void bobsleigh_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14835, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14835, 0, 0, 32, 26, 2, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14851, 0, 0, 32, 26, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14851, 0, 0, 32, 26, 0, height, 0, 6, height + 27);
metal_a_supports_paint_setup(0, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14839, 0, 0, 32, 26, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14839, 0, 0, 32, 26, 2, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14855, 0, 0, 32, 26, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14855, 0, 0, 32, 26, 0, height, 0, 6, height + 27);
metal_a_supports_paint_setup(0, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1076,7 +1076,7 @@ static void bobsleigh_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14854, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14854, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -1114,7 +1114,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14792, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14792, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -1165,7 +1165,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14790, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14790, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -1210,7 +1210,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14816, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14816, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -1261,7 +1261,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14814, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14814, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -1306,7 +1306,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14896, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14896, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -1357,7 +1357,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14894, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14894, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height + 8, TUNNEL_0); paint_util_push_tunnel_right(height + 8, TUNNEL_0);
@ -1388,7 +1388,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14905, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14905, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -1444,7 +1444,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14903, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14903, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0);
} }
@ -1477,7 +1477,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14879, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14879, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -1528,7 +1528,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14881, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14881, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
paint_util_push_tunnel_right(height + 8, TUNNEL_0); paint_util_push_tunnel_right(height + 8, TUNNEL_0);
@ -1559,7 +1559,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14870, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14870, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -1615,7 +1615,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14872, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14872, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0);
} }
@ -1670,7 +1670,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14970, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14970, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -1768,7 +1768,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14966, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14966, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height + 8, TUNNEL_0); paint_util_push_tunnel_right(height + 8, TUNNEL_0);
@ -1799,7 +1799,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14985, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14985, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -1902,7 +1902,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14981, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14981, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0);
} }
@ -1935,7 +1935,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14941, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14941, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -2033,7 +2033,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14945, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14945, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
paint_util_push_tunnel_right(height + 8, TUNNEL_0); paint_util_push_tunnel_right(height + 8, TUNNEL_0);
@ -2064,7 +2064,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14926, 0, 0, 20, 32, 0, height, 6, 0, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14926, 0, 0, 20, 32, 0, height, 6, 0, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -2167,7 +2167,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14930, 0, 0, 32, 20, 0, height, 0, 6, height + 27); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14930, 0, 0, 32, 20, 0, height, 0, 6, height + 27);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height + 8, TUNNEL_0);
} }
@ -2215,7 +2215,7 @@ static void bobsleigh_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -2238,7 +2238,7 @@ static void bobsleigh_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

488
src/openrct2/ride/coaster/compact_inverted_coaster.c
View File

File diff suppressed because it is too large Load Diff

604
src/openrct2/ride/coaster/corkscrew_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

1230
src/openrct2/ride/coaster/flying_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

574
src/openrct2/ride/coaster/giga_coaster.c
View File

File diff suppressed because it is too large Load Diff

60
src/openrct2/ride/coaster/inverted_hairpin_coaster.c
View File

@ -59,7 +59,7 @@ static void inverted_hairpin_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(11, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -125,16 +125,16 @@ static void inverted_hairpin_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -229,16 +229,16 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -341,16 +341,16 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, ui
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -402,16 +402,16 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -481,7 +481,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(11, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -526,7 +526,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(11, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -569,7 +569,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIn
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(11, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1);
@ -599,7 +599,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIn
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(11, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -635,7 +635,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideI
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(11, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1);
@ -665,7 +665,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideI
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(11, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
@ -713,7 +713,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(11, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
@ -825,16 +825,16 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 t
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -874,7 +874,7 @@ static void inverted_hairpin_rc_track_brakes(uint8 rideIndex, uint8 trackSequenc
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(11, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -897,7 +897,7 @@ static void inverted_hairpin_rc_track_block_brakes(uint8 rideIndex, uint8 trackS
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(11, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

26
src/openrct2/ride/coaster/inverted_impulse_coaster.c
View File

@ -42,7 +42,7 @@ static void inverted_impulse_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(11, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -91,16 +91,16 @@ static void inverted_impulse_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -160,16 +160,16 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -258,16 +258,16 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(11, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(11, 8, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(11, 7, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(11, 5, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }

632
src/openrct2/ride/coaster/inverted_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

64
src/openrct2/ride/coaster/junior_roller_coaster.c
View File

@ -1823,8 +1823,8 @@ void junior_rc_paint_station(uint8 rideIndex, uint8 trackSequence, uint8 directi
} }
sub_98199C(imageId, 0, 6, 32, 20, 1, height, 0, 0, height, get_current_rotation()); sub_98199C(imageId, 0, 6, 32, 20, 1, height, 0, 0, height, get_current_rotation());
metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_left(height, TUNNEL_6); paint_util_push_tunnel_left(height, TUNNEL_6);
} else if (direction == 1 || direction == 3) { } else if (direction == 1 || direction == 3) {
@ -1840,8 +1840,8 @@ void junior_rc_paint_station(uint8 rideIndex, uint8 trackSequence, uint8 directi
} }
sub_98199C(imageId, 6, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation()); sub_98199C(imageId, 6, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation());
metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_right(height, TUNNEL_6); paint_util_push_tunnel_right(height, TUNNEL_6);
} }
@ -2609,9 +2609,9 @@ static void junior_rc_s_bend_left_paint_setup(uint8 rideIndex, uint8 trackSequen
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(1, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} else { } else {
if (trackSequence == 3) { if (trackSequence == 3) {
@ -2619,9 +2619,9 @@ static void junior_rc_s_bend_left_paint_setup(uint8 rideIndex, uint8 trackSequen
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(2, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(2, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(2, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} }
@ -2673,9 +2673,9 @@ static void junior_rc_s_bend_right_paint_setup(uint8 rideIndex, uint8 trackSeque
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(1, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} else { } else {
if (trackSequence == 3) { if (trackSequence == 3) {
@ -2683,9 +2683,9 @@ static void junior_rc_s_bend_right_paint_setup(uint8 rideIndex, uint8 trackSeque
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(2, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(2, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(2, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} }
@ -3312,10 +3312,10 @@ static void junior_rc_left_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 tra
metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 4: case 4:
if (direction == 0) metal_a_supports_paint_setup(2, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 1) metal_a_supports_paint_setup(1, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 1) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 2) metal_a_supports_paint_setup(2, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 2) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 3) metal_a_supports_paint_setup(1, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 3) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -3349,10 +3349,10 @@ static void junior_rc_right_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 tr
metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 4: case 4:
if (direction == 0) metal_a_supports_paint_setup(2, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 1) metal_a_supports_paint_setup(1, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 1) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 2) metal_a_supports_paint_setup(2, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 2) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 3) metal_a_supports_paint_setup(1, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 3) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -3483,10 +3483,10 @@ static void junior_rc_left_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uint
metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 4: case 4:
if (direction == 0) metal_a_supports_paint_setup(1, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 1) metal_a_supports_paint_setup(2, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 1) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 2) metal_a_supports_paint_setup(1, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 2) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 3) metal_a_supports_paint_setup(2, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 3) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -3601,10 +3601,10 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uin
metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 4: case 4:
if (direction == 0) metal_a_supports_paint_setup(1, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 1) metal_a_supports_paint_setup(2, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 1) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 2) metal_a_supports_paint_setup(1, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 2) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 3) metal_a_supports_paint_setup(2, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 3) metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }

1161
src/openrct2/ride/coaster/lay_down_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

38
src/openrct2/ride/coaster/lim_launched_roller_coaster.c
View File

@ -57,19 +57,19 @@ static void lim_launched_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trac
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15388, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15388, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15396, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15396, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15395, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15395, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15403, 0, 6, 32, 20, 7, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15403, 0, 6, 32, 20, 7, height);
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -196,19 +196,19 @@ static void lim_launched_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trac
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15395, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15395, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15403, 0, 6, 32, 20, 7, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15403, 0, 6, 32, 20, 7, height);
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15388, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15388, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15396, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15396, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
switch (direction) { switch (direction) {
@ -244,7 +244,7 @@ static void lim_launched_rc_track_right_vertical_loop(uint8 rideIndex, uint8 tra
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15404, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15404, 0, 6, 32, 20, 3, height);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1);
} }
@ -373,7 +373,7 @@ static void lim_launched_rc_track_right_vertical_loop(uint8 rideIndex, uint8 tra
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15411, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15411, 0, 6, 32, 20, 3, height);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
paint_util_push_tunnel_right(height - 8, TUNNEL_1); paint_util_push_tunnel_right(height - 8, TUNNEL_1);
@ -412,7 +412,7 @@ static void lim_launched_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15791, 0, 0, 32, 20, 0, height, 0, 6, height + 28); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15791, 0, 0, 32, 20, 0, height, 0, 6, height + 28);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -497,7 +497,7 @@ static void lim_launched_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15803, 0, 0, 32, 20, 0, height, 0, 6, height + 28); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15803, 0, 0, 32, 20, 0, height, 0, 6, height + 28);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -629,7 +629,7 @@ static void lim_launched_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15785, 0, 0, 32, 20, 0, height, 0, 6, height + 28); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15785, 0, 0, 32, 20, 0, height, 0, 6, height + 28);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -714,7 +714,7 @@ static void lim_launched_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15797, 0, 0, 32, 20, 0, height, 0, 6, height + 28); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15797, 0, 0, 32, 20, 0, height, 0, 6, height + 28);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
@ -791,7 +791,7 @@ static void lim_launched_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 track
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 35, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 35, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -825,7 +825,7 @@ static void lim_launched_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15755, 0, 0, 32, 20, 3, height, 0, 6, height + 4); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15755, 0, 0, 32, 20, 3, height, 0, 6, height + 4);
break; break;
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
} }
@ -867,7 +867,7 @@ static void lim_launched_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trac
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 35, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 35, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
@ -908,7 +908,7 @@ static void lim_launched_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, u
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1129,7 +1129,7 @@ static void lim_launched_rc_track_block_brakes(uint8 rideIndex, uint8 trackSeque
break; break;
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

602
src/openrct2/ride/coaster/looping_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

588
src/openrct2/ride/coaster/mine_ride.c
View File

File diff suppressed because it is too large Load Diff

1028
src/openrct2/ride/coaster/mini_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

156
src/openrct2/ride/coaster/mini_suspended_coaster.c
View File

@ -58,11 +58,11 @@ static void mini_suspended_rc_track_flat(uint8 rideIndex, uint8 trackSequence, u
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -130,16 +130,16 @@ static void mini_suspended_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequen
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 8, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 8, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 7, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 7, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 5, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 5, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -191,16 +191,16 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 8, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 8, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 7, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 7, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 5, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 5, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -252,16 +252,16 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tra
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 8, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 8, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 7, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 7, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 5, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 5, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -316,11 +316,11 @@ static void mini_suspended_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 t
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -409,11 +409,11 @@ static void mini_suspended_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 t
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -461,11 +461,11 @@ static void mini_suspended_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequ
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -493,10 +493,10 @@ static void mini_suspended_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequ
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 5, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 5, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 6, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 6, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -521,10 +521,10 @@ static void mini_suspended_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequ
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 2: case 2:
metal_a_supports_paint_setup(1, 5, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 5, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 6, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 6, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -550,11 +550,11 @@ static void mini_suspended_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequ
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -595,11 +595,11 @@ static void mini_suspended_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSeq
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -627,10 +627,10 @@ static void mini_suspended_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSeq
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 8, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 8, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 7, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 7, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -655,10 +655,10 @@ static void mini_suspended_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSeq
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 2: case 2:
metal_a_supports_paint_setup(1, 8, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 8, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 7, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 7, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -684,11 +684,11 @@ static void mini_suspended_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSeq
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -729,11 +729,11 @@ static void mini_suspended_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 t
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -783,11 +783,11 @@ static void mini_suspended_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 t
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -835,11 +835,11 @@ static void mini_suspended_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 t
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -907,16 +907,16 @@ static void mini_suspended_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 t
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 3, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 3, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 1, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 1, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 0, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 0, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 2, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 2, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -949,11 +949,11 @@ static void mini_suspended_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8
switch (direction) { switch (direction) {
case 0: case 0:
case 2: case 2:
metal_a_supports_paint_setup(1, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
metal_a_supports_paint_setup(2, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1021,16 +1021,16 @@ static void mini_suspended_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 1, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1126,16 +1126,16 @@ static void mini_suspended_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequen
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 1, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1217,16 +1217,16 @@ static void mini_suspended_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackS
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1308,16 +1308,16 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 1, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1399,16 +1399,16 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(1, 1, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1490,16 +1490,16 @@ static void mini_suspended_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trac
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1578,16 +1578,16 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, ui
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 1, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
break; break;
@ -1669,16 +1669,16 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, ui
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(1, 1, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 1, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(2, 0, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 0, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(1, 2, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 2, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(2, 3, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 3, 0, height + 34, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }

900
src/openrct2/ride/coaster/multi_dimension_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

598
src/openrct2/ride/coaster/stand_up_roller_coaster.c
View File

File diff suppressed because it is too large Load Diff

288
src/openrct2/ride/coaster/steeplechase.c
View File

@ -34,12 +34,12 @@ static void steeplechase_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
case 0: case 0:
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
@ -47,12 +47,12 @@ static void steeplechase_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
case 0: case 0:
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28633, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28633, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28634, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28634, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -86,38 +86,38 @@ static void steeplechase_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28649, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28649, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28655, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28655, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28651, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28651, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28656, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28656, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28637, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28637, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28643, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28643, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28639, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28639, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28644, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28644, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -137,38 +137,38 @@ static void steeplechase_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28650, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28650, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28657, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28657, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28652, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28652, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28658, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28658, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28638, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28638, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28645, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28645, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28640, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28640, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28646, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28646, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 2, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -188,38 +188,38 @@ static void steeplechase_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28654, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28654, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28660, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28660, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28653, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28653, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28659, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28659, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28642, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28642, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28648, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28648, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28641, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28641, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28647, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28647, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -258,19 +258,19 @@ static void steeplechase_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackS
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28698, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28698, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28703, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28703, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28708, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28708, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28693, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28693, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height - 1, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height - 1, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -343,19 +343,19 @@ static void steeplechase_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackS
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28694, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28694, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28699, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28699, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28704, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28704, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(5, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28689, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28689, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
switch (direction) { switch (direction) {
@ -387,19 +387,19 @@ static void steeplechase_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28665, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28665, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28672, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28672, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28668, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28668, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28669, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28669, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -412,11 +412,11 @@ static void steeplechase_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28666, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28666, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(4, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28671, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28671, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(5, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28667, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28667, 0, 6, 32, 26, 3, height);
@ -438,11 +438,11 @@ static void steeplechase_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28666, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28666, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(4, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28671, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28671, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(5, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -452,19 +452,19 @@ static void steeplechase_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28668, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28668, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28669, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28669, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28665, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28665, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28672, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28672, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
switch (direction) { switch (direction) {
@ -489,19 +489,19 @@ static void steeplechase_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28661, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28661, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28676, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28676, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28664, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28664, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28673, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28673, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -514,11 +514,11 @@ static void steeplechase_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28662, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28662, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(4, 8, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 8, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28675, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28675, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(5, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28663, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28663, 0, 0, 32, 26, 3, height);
@ -540,11 +540,11 @@ static void steeplechase_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28662, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28662, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(4, 8, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 8, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28675, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28675, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(5, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -554,19 +554,19 @@ static void steeplechase_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28664, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28664, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28673, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28673, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28661, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28661, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28676, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28676, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
switch (direction) { switch (direction) {
@ -591,19 +591,19 @@ static void steeplechase_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackS
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28682, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28682, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28685, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28685, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28688, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28688, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28679, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28679, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -637,19 +637,19 @@ static void steeplechase_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackS
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28680, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28680, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28683, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28683, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(4, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28686, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28686, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(5, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28677, 6, 0, 20, 32, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28677, 6, 0, 20, 32, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height - 3, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
switch (direction) { switch (direction) {
@ -680,12 +680,12 @@ static void steeplechase_track_brakes(uint8 rideIndex, uint8 trackSequence, uint
case 0: case 0:
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -701,19 +701,19 @@ static void steeplechase_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackS
switch (direction) { switch (direction) {
case 0: case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28725, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28725, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28729, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28729, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28733, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28733, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28737, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28737, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -766,19 +766,19 @@ static void steeplechase_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackS
switch (direction) { switch (direction) {
case 0: case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28728, 0, 0, 16, 16, 3, height, 16, 16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28728, 0, 0, 16, 16, 3, height, 16, 16, height);
metal_a_supports_paint_setup(4, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28732, 0, 0, 16, 18, 3, height, 0, 16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28732, 0, 0, 16, 18, 3, height, 0, 16, height);
metal_a_supports_paint_setup(5, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28736, 0, 0, 16, 16, 3, height, 0, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28736, 0, 0, 16, 16, 3, height, 0, 0, height);
metal_a_supports_paint_setup(4, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28740, 0, 0, 16, 16, 3, height, 16, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28740, 0, 0, 16, 16, 3, height, 16, 0, height);
metal_a_supports_paint_setup(5, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -795,19 +795,19 @@ static void steeplechase_track_right_eighth_to_diag(uint8 rideIndex, uint8 track
switch (direction) { switch (direction) {
case 0: case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28709, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28709, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28713, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28713, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28717, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28717, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28721, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28721, 0, 0, 32, 20, 3, height, 0, 6, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -860,19 +860,19 @@ static void steeplechase_track_right_eighth_to_diag(uint8 rideIndex, uint8 track
switch (direction) { switch (direction) {
case 0: case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28712, 0, 0, 16, 16, 3, height, 16, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28712, 0, 0, 16, 16, 3, height, 16, 0, height);
metal_a_supports_paint_setup(4, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28716, 0, 0, 16, 16, 3, height, 0, 0, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28716, 0, 0, 16, 16, 3, height, 0, 0, height);
metal_a_supports_paint_setup(5, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28720, 0, 0, 16, 18, 3, height, 0, 16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28720, 0, 0, 16, 18, 3, height, 0, 16, height);
metal_a_supports_paint_setup(4, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28724, 0, 0, 16, 16, 3, height, 16, 16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28724, 0, 0, 16, 16, 3, height, 16, 16, height);
metal_a_supports_paint_setup(5, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -954,33 +954,33 @@ static void steeplechase_track_diag_flat(uint8 rideIndex, uint8 trackSequence, u
if (track_element_is_lift_hill(mapElement)) { if (track_element_is_lift_hill(mapElement)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(4, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28758, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28758, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_a_supports_paint_setup(5, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(4, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(5, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(4, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28742, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28742, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_a_supports_paint_setup(5, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(4, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(5, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -1049,33 +1049,33 @@ static void steeplechase_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequen
if (track_element_is_lift_hill(mapElement)) { if (track_element_is_lift_hill(mapElement)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28770, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28770, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28754, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28754, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -1144,33 +1144,33 @@ static void steeplechase_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 tra
if (track_element_is_lift_hill(mapElement)) { if (track_element_is_lift_hill(mapElement)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28762, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28762, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28746, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28746, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -1239,33 +1239,33 @@ static void steeplechase_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 tra
if (track_element_is_lift_hill(mapElement)) { if (track_element_is_lift_hill(mapElement)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28766, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28766, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28750, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28750, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -1334,33 +1334,33 @@ static void steeplechase_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequ
if (track_element_is_lift_hill(mapElement)) { if (track_element_is_lift_hill(mapElement)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28772, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28772, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28756, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28756, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 6, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -1426,33 +1426,33 @@ static void steeplechase_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 t
if (track_element_is_lift_hill(mapElement)) { if (track_element_is_lift_hill(mapElement)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28768, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28768, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28752, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28752, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 4, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -1522,33 +1522,33 @@ static void steeplechase_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 t
if (track_element_is_lift_hill(mapElement)) { if (track_element_is_lift_hill(mapElement)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28764, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28764, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} else { } else {
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(4, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28748, -16, -16, 32, 32, 3, height, -16, -16, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28748, -16, -16, 32, 32, 3, height, -16, -16, height);
metal_b_supports_paint_setup(5, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(4, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(5, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -1565,12 +1565,12 @@ static void steeplechase_track_block_brakes(uint8 rideIndex, uint8 trackSequence
case 0: case 0:
case 2: case 2:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
case 3: case 3:
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height);
metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

218
src/openrct2/ride/coaster/suspended_swinging_coaster.c
View File

@ -55,7 +55,7 @@ static void suspended_swinging_rc_track_flat(uint8 rideIndex, uint8 trackSequenc
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -121,16 +121,16 @@ static void suspended_swinging_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSe
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 8, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 7, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 5, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -208,16 +208,16 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 8, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 7, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 5, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -301,16 +301,16 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex,
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 6, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 8, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 7, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 5, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -362,16 +362,16 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 8, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 7, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 5, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -441,7 +441,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(uint8 rideIndex, uin
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -525,7 +525,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(uint8 rideIndex, uin
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -568,7 +568,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(uint8 ride
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4);
@ -652,7 +652,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(uint8 ride
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -688,7 +688,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(uint8 rid
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4);
@ -772,7 +772,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(uint8 rid
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
@ -822,7 +822,7 @@ static void suspended_swinging_rc_track_s_bend_left(uint8 rideIndex, uint8 track
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -848,10 +848,10 @@ static void suspended_swinging_rc_track_s_bend_left(uint8 rideIndex, uint8 track
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 5, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -876,10 +876,10 @@ static void suspended_swinging_rc_track_s_bend_left(uint8 rideIndex, uint8 track
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 2: case 2:
metal_a_supports_paint_setup(0, 5, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -902,7 +902,7 @@ static void suspended_swinging_rc_track_s_bend_left(uint8 rideIndex, uint8 track
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
@ -938,7 +938,7 @@ static void suspended_swinging_rc_track_s_bend_right(uint8 rideIndex, uint8 trac
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -964,10 +964,10 @@ static void suspended_swinging_rc_track_s_bend_right(uint8 rideIndex, uint8 trac
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 8, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 7, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -992,10 +992,10 @@ static void suspended_swinging_rc_track_s_bend_right(uint8 rideIndex, uint8 trac
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 2: case 2:
metal_a_supports_paint_setup(0, 8, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 7, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1018,7 +1018,7 @@ static void suspended_swinging_rc_track_s_bend_right(uint8 rideIndex, uint8 trac
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
@ -1054,7 +1054,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(uint8 rideIndex, uin
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -1099,7 +1099,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(uint8 rideIndex, uin
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -1142,7 +1142,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(uint8 ride
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4);
@ -1172,7 +1172,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(uint8 ride
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -1208,7 +1208,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(uint8 rid
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_4);
@ -1238,7 +1238,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(uint8 rid
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
@ -1283,7 +1283,7 @@ static void suspended_swinging_rc_track_brakes(uint8 rideIndex, uint8 trackSeque
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -1311,7 +1311,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(uint8 rideIn
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -1395,7 +1395,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(uint8 rideIn
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -1431,7 +1431,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(uint8 rideI
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -1515,7 +1515,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(uint8 rideI
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
@ -1551,7 +1551,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(uint8 ride
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3);
@ -1635,7 +1635,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(uint8 ride
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -1671,7 +1671,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(uint8 rid
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height + 16, TUNNEL_3);
@ -1755,7 +1755,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(uint8 rid
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 0: case 0:
@ -1791,7 +1791,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(uint8 rideIndex, uin
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -1857,16 +1857,16 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(uint8 rideIndex, uin
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 3, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 1, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 0, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 2, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1896,7 +1896,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(uint8 rideIndex, ui
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);
@ -1962,16 +1962,16 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(uint8 rideIndex, ui
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 1, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2067,16 +2067,16 @@ static void suspended_swinging_rc_track_diag_flat(uint8 rideIndex, uint8 trackSe
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 1, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2158,16 +2158,16 @@ static void suspended_swinging_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 tr
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 1, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2217,16 +2217,16 @@ static void suspended_swinging_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 tr
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(0, 1, 32, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 32, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_b_supports_paint_setup(0, 0, 36, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 36, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(0, 2, 32, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 32, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(0, 3, 36, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 36, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2308,16 +2308,16 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex,
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2367,16 +2367,16 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIn
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(0, 1, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_b_supports_paint_setup(0, 0, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(0, 2, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(0, 3, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 16, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2426,16 +2426,16 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIn
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(0, 1, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_b_supports_paint_setup(0, 0, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(0, 2, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(0, 3, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 21, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2517,16 +2517,16 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex,
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(0, 1, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2608,16 +2608,16 @@ static void suspended_swinging_rc_track_diag_25_deg_down(uint8 rideIndex, uint8
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 1, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2739,16 +2739,16 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 1, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
break; break;
@ -2798,16 +2798,16 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(uint8 ri
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(0, 1, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_b_supports_paint_setup(0, 0, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(0, 2, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(0, 3, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 17, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2857,16 +2857,16 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(uint8 ri
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_b_supports_paint_setup(0, 1, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_b_supports_paint_setup(0, 0, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_b_supports_paint_setup(0, 2, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_b_supports_paint_setup(0, 3, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 8, height + 44, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2948,16 +2948,16 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(0, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(0, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(0, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(0, 3, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 3, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -2982,7 +2982,7 @@ static void suspended_swinging_rc_track_block_brakes(uint8 rideIndex, uint8 trac
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_3); paint_util_push_tunnel_rotated(direction, height, TUNNEL_3);

40
src/openrct2/ride/coaster/wild_mouse.c
View File

@ -183,7 +183,7 @@ static void wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 di
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK]; uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -227,7 +227,7 @@ static void wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uin
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK]; uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1);
@ -257,9 +257,9 @@ static void wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uin
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
metal_a_supports_paint_setup(0, 4, -33, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -33, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(0, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -285,7 +285,7 @@ static void wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeque
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK]; uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, -4, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -4, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -322,7 +322,7 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, -13, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -13, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1);
@ -359,7 +359,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, -21, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -21, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_1);
@ -384,7 +384,7 @@ static void wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK]; uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, -7, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -7, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_0);
@ -462,7 +462,7 @@ static void wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSe
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 3: case 3:
metal_a_supports_paint_setup(0, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -511,7 +511,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, u
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 3: case 3:
metal_a_supports_paint_setup(0, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -565,13 +565,13 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uin
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
metal_a_supports_paint_setup(0, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
if (direction == 2) { if (direction == 2) {
metal_a_supports_paint_setup(0, 4, -11, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -11, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(0, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]);
} }
break; break;
} }
@ -623,7 +623,7 @@ static void wild_mouse_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSeq
sub_98197C(imageId, 0, 0, 24, 24, 2, height, 6, 6, height, get_current_rotation()); sub_98197C(imageId, 0, 0, 24, 24, 2, height, 6, 6, height, get_current_rotation());
break; break;
} }
metal_a_supports_paint_setup(0, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0); track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 32, 0x20); paint_util_set_general_support_height(height + 32, 0x20);
@ -661,7 +661,7 @@ static void wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 2, 43, height, 0, 4, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 2, 43, height, 0, 4, height);
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, -5, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -5, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -699,9 +699,9 @@ static void wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque
} }
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
metal_a_supports_paint_setup(0, 4, -17, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -17, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(0, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
} }
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -731,7 +731,7 @@ static void wild_mouse_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
uint32 imageId = _wild_mouse_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK]; uint32 imageId = _wild_mouse_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -751,7 +751,7 @@ static void wild_mouse_track_rotation_control_toggle(uint8 rideIndex, uint8 trac
uint32 imageId = imageIds[direction] | gTrackColours[SCHEME_TRACK]; uint32 imageId = imageIds[direction] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -764,7 +764,7 @@ static void wild_mouse_track_block_brakes(uint8 rideIndex, uint8 trackSequence,
uint32 imageId = _wild_mouse_block_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK]; uint32 imageId = _wild_mouse_block_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

40
src/openrct2/ride/coaster/wooden_roller_coaster.c
View File

@ -1796,7 +1796,7 @@ static void wooden_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeque
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23468, 0, 6, 32, 20, 7, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23468, 0, 6, 32, 20, 7, height);
break; break;
} }
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7);
} }
@ -1807,19 +1807,19 @@ static void wooden_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeque
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23454, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23454, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23462, 0, 14, 32, 2, 63, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23462, 0, 14, 32, 2, 63, height);
metal_a_supports_paint_setup(3, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23459, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23459, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23467, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23467, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -1907,19 +1907,19 @@ static void wooden_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeque
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23459, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23459, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23467, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23467, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23454, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23454, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23462, 0, 14, 32, 2, 63, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23462, 0, 14, 32, 2, 63, height);
metal_a_supports_paint_setup(3, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
@ -1940,7 +1940,7 @@ static void wooden_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeque
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23461, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23461, 0, 6, 32, 20, 3, height);
break; break;
} }
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
paint_util_push_tunnel_right(height - 8, TUNNEL_7); paint_util_push_tunnel_right(height - 8, TUNNEL_7);
@ -1974,7 +1974,7 @@ static void wooden_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23469, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23469, 0, 6, 32, 20, 3, height);
break; break;
} }
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7); paint_util_push_tunnel_rotated(direction, height - 8, TUNNEL_7);
} }
@ -1984,19 +1984,19 @@ static void wooden_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequ
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23483, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23483, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23475, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23475, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23478, 0, 14, 32, 2, 63, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23478, 0, 14, 32, 2, 63, height);
metal_a_supports_paint_setup(3, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23470, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23470, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_general_support_height(height + 72, 0x20); paint_util_set_general_support_height(height + 72, 0x20);
@ -2079,19 +2079,19 @@ static void wooden_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequ
switch (direction) { switch (direction) {
case 0: case 0:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23478, 0, 14, 32, 2, 63, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23478, 0, 14, 32, 2, 63, height);
metal_a_supports_paint_setup(3, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23470, 0, 0, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23470, 0, 0, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23483, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23483, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23475, 0, 6, 32, 26, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23475, 0, 6, 32, 26, 3, height);
metal_a_supports_paint_setup(3, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
paint_util_set_general_support_height(height + 72, 0x20); paint_util_set_general_support_height(height + 72, 0x20);
@ -2111,7 +2111,7 @@ static void wooden_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23476, 0, 6, 32, 20, 3, height); sub_98196C_rotated(direction, wooden_rc_get_rails_colour() | 23476, 0, 6, 32, 20, 3, height);
break; break;
} }
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
paint_util_push_tunnel_right(height - 8, TUNNEL_7); paint_util_push_tunnel_right(height - 8, TUNNEL_7);

28
src/openrct2/ride/gentle/car_ride.c
View File

@ -178,7 +178,7 @@ static void paint_car_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
} }
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 32, 0x20); paint_util_set_general_support_height(height + 32, 0x20);
} }
@ -209,7 +209,7 @@ static void paint_car_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence,
break; break;
} }
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 56, 0x20); paint_util_set_general_support_height(height + 56, 0x20);
} }
@ -240,7 +240,7 @@ static void paint_car_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS
break; break;
} }
metal_a_supports_paint_setup(3, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 48, 0x20); paint_util_set_general_support_height(height + 48, 0x20);
} }
@ -271,7 +271,7 @@ static void paint_car_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS
break; break;
} }
metal_a_supports_paint_setup(3, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 40, 0x20); paint_util_set_general_support_height(height + 40, 0x20);
} }
@ -321,11 +321,11 @@ static void paint_car_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 d
} }
if (direction == 0 || direction == 2) { if (direction == 0 || direction == 2) {
metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement); track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement);
@ -343,7 +343,7 @@ static void paint_car_ride_track_right_quarter_turn_3_tiles(uint8 rideIndex, uin
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 3: case 3:
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -378,7 +378,7 @@ static void paint_car_ride_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8
case 3: sub_98196C(imageId, 6, 6, 24, 24, 1, height, get_current_rotation()); break; case 3: sub_98196C(imageId, 6, 6, 24, 24, 1, height, get_current_rotation()); break;
} }
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0); track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0);
@ -456,7 +456,7 @@ static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence,
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -502,7 +502,7 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 t
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -548,7 +548,7 @@ static void paint_car_ride_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 t
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -590,7 +590,7 @@ static void paint_car_ride_track_log_bumps(uint8 rideIndex, uint8 trackSequence,
paint_util_push_tunnel_right(height, TUNNEL_0); paint_util_push_tunnel_right(height, TUNNEL_0);
} }
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
paint_util_set_general_support_height(height + 32, 0x20); paint_util_set_general_support_height(height + 32, 0x20);
} }

22
src/openrct2/ride/gentle/ghost_train.c
View File

@ -166,7 +166,7 @@ static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, u
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -193,7 +193,7 @@ static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequen
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
@ -236,7 +236,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
switch (direction) { switch (direction) {
@ -277,7 +277,7 @@ static void paint_ghost_train_track_25_deg_up_to_flat_shared(uint8 rideIndex, ui
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -349,11 +349,11 @@ static void paint_ghost_train_station(uint8 rideIndex, uint8 trackSequence, uint
} }
if (direction == 0 || direction == 2) { if (direction == 0 || direction == 2) {
metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement); track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement);
@ -371,7 +371,7 @@ static void paint_ghost_train_track_right_quarter_turn_3_tiles(uint8 rideIndex,
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 3: case 3:
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -399,7 +399,7 @@ static void paint_ghost_train_track_left_quarter_turn_1_tile(uint8 rideIndex, ui
track_paint_util_left_quarter_turn_1_tile_paint(3, height, 0, direction, gTrackColours[SCHEME_TRACK], ghost_train_track_pieces_quarter_turn_1_tile, get_current_rotation()); track_paint_util_left_quarter_turn_1_tile_paint(3, height, 0, direction, gTrackColours[SCHEME_TRACK], ghost_train_track_pieces_quarter_turn_1_tile, get_current_rotation());
track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0); track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0);
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0); paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(height + 32, 0x20); paint_util_set_general_support_height(height + 32, 0x20);
} }
@ -455,7 +455,7 @@ static void paint_ghost_train_track_brakes(uint8 rideIndex, uint8 trackSequence,
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);

10
src/openrct2/ride/gentle/mini_golf.c
View File

@ -475,7 +475,7 @@ static void paint_mini_golf_track_flat(uint8 rideIndex, uint8 trackSequence, uin
paint_util_push_tunnel_left(height, TUNNEL_10); paint_util_push_tunnel_left(height, TUNNEL_10);
} }
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
if (mini_golf_paint_util_should_draw_fence(mapElement)) { if (mini_golf_paint_util_should_draw_fence(mapElement)) {
@ -505,7 +505,7 @@ static void paint_mini_golf_track_25_deg_up(uint8 rideIndex, uint8 trackSequence
imageId = mini_golf_track_sprites_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK]; imageId = mini_golf_track_sprites_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
mini_golf_paint_util_7c(direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); mini_golf_paint_util_7c(direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation());
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
imageId = mini_golf_track_sprites_25_deg_up[direction][1] | gTrackColours[SCHEME_MISC]; imageId = mini_golf_track_sprites_25_deg_up[direction][1] | gTrackColours[SCHEME_MISC];
@ -540,7 +540,7 @@ static void paint_mini_golf_track_flat_to_25_deg_up(uint8 rideIndex, uint8 track
imageId = mini_golf_track_sprites_flat_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK]; imageId = mini_golf_track_sprites_flat_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
mini_golf_paint_util_7c(direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); mini_golf_paint_util_7c(direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation());
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
imageId = mini_golf_track_sprites_flat_to_25_deg_up[direction][1] | gTrackColours[SCHEME_MISC]; imageId = mini_golf_track_sprites_flat_to_25_deg_up[direction][1] | gTrackColours[SCHEME_MISC];
@ -575,7 +575,7 @@ static void paint_mini_golf_track_25_deg_up_to_flat(uint8 rideIndex, uint8 track
imageId = mini_golf_track_sprites_25_deg_up_to_flat[direction][0] | gTrackColours[SCHEME_TRACK]; imageId = mini_golf_track_sprites_25_deg_up_to_flat[direction][0] | gTrackColours[SCHEME_TRACK];
mini_golf_paint_util_7c(direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation()); mini_golf_paint_util_7c(direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height, get_current_rotation());
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
imageId = mini_golf_track_sprites_25_deg_up_to_flat[direction][1] | gTrackColours[SCHEME_MISC]; imageId = mini_golf_track_sprites_25_deg_up_to_flat[direction][1] | gTrackColours[SCHEME_MISC];
@ -682,7 +682,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(uint8 rideIndex, uint
track_paint_util_left_quarter_turn_1_tile_paint(1, height, 0, direction, gTrackColours[SCHEME_TRACK], mini_golf_track_sprites_quarter_turn_1_tile, get_current_rotation()); track_paint_util_left_quarter_turn_1_tile_paint(1, height, 0, direction, gTrackColours[SCHEME_TRACK], mini_golf_track_sprites_quarter_turn_1_tile, get_current_rotation());
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0, direction), 0xFFFF, 0);

18
src/openrct2/ride/gentle/mini_helicopters.c
View File

@ -35,8 +35,8 @@ static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSeq
imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW | gTrackColours[SCHEME_TRACK]; imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW | gTrackColours[SCHEME_TRACK];
sub_98199C(imageId, 0, 0, 32, 20, 1, height, 0, 0, height, get_current_rotation()); sub_98199C(imageId, 0, 0, 32, 20, 1, height, 0, 0, height, get_current_rotation());
metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_left(height, TUNNEL_6); paint_util_push_tunnel_left(height, TUNNEL_6);
} else if (direction == 1 || direction == 3) { } else if (direction == 1 || direction == 3) {
imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC]; imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC];
@ -45,8 +45,8 @@ static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSeq
imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW | gTrackColours[SCHEME_TRACK]; imageId = SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW | gTrackColours[SCHEME_TRACK];
sub_98199C(imageId, 0, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation()); sub_98199C(imageId, 0, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation());
metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_right(height, TUNNEL_6); paint_util_push_tunnel_right(height, TUNNEL_6);
} }
@ -110,7 +110,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(4, 4, -4, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -4, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -147,7 +147,7 @@ static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackS
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(4, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -184,7 +184,7 @@ static void paint_mini_helicopters_track_25_deg_up_to_flat(uint8 rideIndex, uint
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(4, 4, -7, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -7, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -217,14 +217,14 @@ static void paint_mini_helicopters_track_left_quarter_turn_3_tiles(uint8 rideInd
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
metal_a_supports_paint_setup(4, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0);
break; break;
case 2: case 2:
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(4, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0);
break; break;
} }

36
src/openrct2/ride/gentle/monorail_cycles.c
View File

@ -213,8 +213,8 @@ static void paint_monorail_cycles_station(uint8 rideIndex, uint8 trackSequence,
imageId = SPR_MONORAIL_CYCLES_FLAT_SW_NE | gTrackColours[SCHEME_TRACK]; imageId = SPR_MONORAIL_CYCLES_FLAT_SW_NE | gTrackColours[SCHEME_TRACK];
sub_98199C(imageId, 0, 0, 32, 20, 1, height, 0, 0, height, get_current_rotation()); sub_98199C(imageId, 0, 0, 32, 20, 1, height, 0, 0, height, get_current_rotation());
metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_left(height, TUNNEL_6); paint_util_push_tunnel_left(height, TUNNEL_6);
} else if (direction == 1 || direction == 3) { } else if (direction == 1 || direction == 3) {
imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC]; imageId = SPR_STATION_BASE_B_NW_SE | gTrackColours[SCHEME_MISC];
@ -223,8 +223,8 @@ static void paint_monorail_cycles_station(uint8 rideIndex, uint8 trackSequence,
imageId = SPR_MONORAIL_CYCLES_FLAT_NW_SE | gTrackColours[SCHEME_TRACK]; imageId = SPR_MONORAIL_CYCLES_FLAT_NW_SE | gTrackColours[SCHEME_TRACK];
sub_98199C(imageId, 0, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation()); sub_98199C(imageId, 0, 0, 20, 32, 1, height, 0, 0, height, get_current_rotation());
metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_right(height, TUNNEL_6); paint_util_push_tunnel_right(height, TUNNEL_6);
} }
@ -242,14 +242,14 @@ static void paint_monorail_cycles_track_left_quarter_turn_3_tiles(uint8 rideInde
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
metal_a_supports_paint_setup(4, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0);
break; break;
case 2: case 2:
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(4, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0);
break; break;
} }
@ -363,9 +363,9 @@ static void paint_monorail_cycles_track_s_bend_left(uint8 rideIndex, uint8 track
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(4, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} else { } else {
if (trackSequence == 3) { if (trackSequence == 3) {
@ -373,9 +373,9 @@ static void paint_monorail_cycles_track_s_bend_left(uint8 rideIndex, uint8 track
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(5, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(5, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} }
@ -409,9 +409,9 @@ static void paint_monorail_cycles_track_s_bend_right(uint8 rideIndex, uint8 trac
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(4, 8, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 8, 0, height - 2, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(4, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} else { } else {
if (trackSequence == 3) { if (trackSequence == 3) {
@ -419,9 +419,9 @@ static void paint_monorail_cycles_track_s_bend_right(uint8 rideIndex, uint8 trac
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(5, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(5, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_STICK_ALT, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} }

8
src/openrct2/ride/thrill/magic_carpet.c
View File

@ -194,11 +194,11 @@ static void paint_magic_carpet(uint8 rideIndex, uint8 trackSequence, uint8 direc
case 0: case 0:
case 2: case 2:
if (direction & 1) { if (direction & 1) {
metal_a_supports_paint_setup(0, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(0, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(0, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(0, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
uint32 imageId = SPR_STATION_BASE_D | gTrackColours[SCHEME_SUPPORTS]; uint32 imageId = SPR_STATION_BASE_D | gTrackColours[SCHEME_SUPPORTS];

8
src/openrct2/ride/thrill/pirate_ship.c
View File

@ -169,14 +169,14 @@ static void paint_pirate_ship(uint8 rideIndex, uint8 trackSequence, uint8 direct
if (relativeTrackSequence == 1 || relativeTrackSequence == 4) { if (relativeTrackSequence == 1 || relativeTrackSequence == 4) {
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL);
} else if (direction & 1) { } else if (direction & 1) {
metal_a_supports_paint_setup(0, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(0, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
imageId = SPR_STATION_BASE_A_NW_SE | gTrackColours[SCHEME_SUPPORTS]; imageId = SPR_STATION_BASE_A_NW_SE | gTrackColours[SCHEME_SUPPORTS];
sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation()); sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation());
} else { } else {
metal_a_supports_paint_setup(0, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(0, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
imageId = SPR_STATION_BASE_A_SW_NE | gTrackColours[SCHEME_SUPPORTS]; imageId = SPR_STATION_BASE_A_SW_NE | gTrackColours[SCHEME_SUPPORTS];
sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation()); sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation());

8
src/openrct2/ride/thrill/swinging_inverter_ship.c
View File

@ -127,11 +127,11 @@ static void paint_swinging_inverter_ship(uint8 rideIndex, uint8 trackSequence, u
if (relativeTrackSequence != 1 && relativeTrackSequence != 3) { if (relativeTrackSequence != 1 && relativeTrackSequence != 3) {
if (direction & 1) { if (direction & 1) {
metal_a_supports_paint_setup(0, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(0, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(0, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(0, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
imageId = SPR_STATION_BASE_D | gTrackColours[SCHEME_SUPPORTS]; imageId = SPR_STATION_BASE_D | gTrackColours[SCHEME_SUPPORTS];

2
src/openrct2/ride/track_paint.c
View File

@ -1727,7 +1727,7 @@ void track_paint_util_left_corkscrew_up_supports(uint8 direction, uint16 height)
if (direction == 2) { if (direction == 2) {
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
} }
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction != 2) { if (direction != 2) {
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
} }

4
src/openrct2/ride/transport/chairlift.c
View File

@ -91,7 +91,7 @@ static void chairlift_paint_util_draw_supports(int segments, uint16 height)
continue; continue;
} }
if (metal_a_supports_paint_setup(10, s, 0, height, gTrackColours[SCHEME_SUPPORTS])) { if (metal_a_supports_paint_setup(METAL_SUPPORTS_TRUSS, s, 0, height, gTrackColours[SCHEME_SUPPORTS])) {
success = true; success = true;
} }
} }
@ -106,7 +106,7 @@ static void chairlift_paint_util_draw_supports(int segments, uint16 height)
} }
uint16 temp = gSupportSegments[s].height; uint16 temp = gSupportSegments[s].height;
gSupportSegments[s].height = gSupport.height; gSupportSegments[s].height = gSupport.height;
metal_a_supports_paint_setup(10, s, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TRUSS, s, 0, height, gTrackColours[SCHEME_SUPPORTS]);
gSupportSegments[s].height = temp; gSupportSegments[s].height = temp;
} }
} }

86
src/openrct2/ride/transport/monorail.c
View File

@ -460,7 +460,7 @@ static void paint_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -494,11 +494,11 @@ static void paint_monorail_station(uint8 rideIndex, uint8 trackSequence, uint8 d
} }
if (direction == 0 || direction == 2) { if (direction == 0 || direction == 2) {
metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement); track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement);
@ -528,7 +528,7 @@ static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence,
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -556,7 +556,7 @@ static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -584,7 +584,7 @@ static void paint_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS
} }
if (track_paint_util_should_paint_supports(position)) { if (track_paint_util_should_paint_supports(position)) {
metal_a_supports_paint_setup(3, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC, direction), 0xFFFF, 0);
@ -617,7 +617,7 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(uint8 rideIndex, uin
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 6: case 6:
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -695,9 +695,9 @@ static void paint_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequenc
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} else { } else {
if (trackSequence == 3) { if (trackSequence == 3) {
@ -705,9 +705,9 @@ static void paint_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequenc
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} }
@ -759,9 +759,9 @@ static void paint_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequen
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} else { } else {
if (trackSequence == 3) { if (trackSequence == 3) {
@ -769,9 +769,9 @@ static void paint_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequen
} }
switch (trackSequence) { switch (trackSequence) {
case 0: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 0: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 1: metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 1: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
case 3: metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break; case 3: metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); break;
} }
} }
@ -796,7 +796,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(uint8 rideIndex, uin
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 3: case 3:
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -832,13 +832,13 @@ static void paint_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 trac
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 4: case 4:
if (direction == 0) metal_a_supports_paint_setup(3, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 1) metal_a_supports_paint_setup(3, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 1) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 2) metal_a_supports_paint_setup(3, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 2) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 3) metal_a_supports_paint_setup(3, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 3) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -875,13 +875,13 @@ static void paint_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 tra
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 4: case 4:
if (direction == 0) metal_a_supports_paint_setup(3, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 0) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 1) metal_a_supports_paint_setup(3, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 1) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 2) metal_a_supports_paint_setup(3, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 2) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 3) metal_a_supports_paint_setup(3, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); if (direction == 3) metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -925,16 +925,16 @@ static void paint_monorail_util_diag_supports(uint8 direction, int height)
{ {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -964,7 +964,7 @@ static void paint_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSequence,
} }
if (trackSequence == 3) { if (trackSequence == 3) {
metal_a_supports_paint_setup(3, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
int blockedSegments = monorail_diag_blocked_segments[trackSequence]; int blockedSegments = monorail_diag_blocked_segments[trackSequence];
@ -981,7 +981,7 @@ static void paint_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequ
} }
if (trackSequence == 3) { if (trackSequence == 3) {
metal_b_supports_paint_setup(3, monorail_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
int blockedSegments = monorail_diag_blocked_segments[trackSequence]; int blockedSegments = monorail_diag_blocked_segments[trackSequence];
@ -998,7 +998,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 t
} }
if (trackSequence == 3) { if (trackSequence == 3) {
metal_b_supports_paint_setup(3, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
int blockedSegments = monorail_diag_blocked_segments[trackSequence]; int blockedSegments = monorail_diag_blocked_segments[trackSequence];
@ -1015,7 +1015,7 @@ static void paint_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 t
} }
if (trackSequence == 3) { if (trackSequence == 3) {
metal_b_supports_paint_setup(3, monorail_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]);
} }
int blockedSegments = monorail_diag_blocked_segments[trackSequence]; int blockedSegments = monorail_diag_blocked_segments[trackSequence];
@ -1032,7 +1032,7 @@ static void paint_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSe
} }
if (trackSequence == 3) { if (trackSequence == 3) {
metal_b_supports_paint_setup(3, monorail_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
int blockedSegments = monorail_diag_blocked_segments[trackSequence]; int blockedSegments = monorail_diag_blocked_segments[trackSequence];
@ -1049,7 +1049,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8
} }
if (trackSequence == 3) { if (trackSequence == 3) {
metal_b_supports_paint_setup(3, monorail_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]);
} }
int blockedSegments = monorail_diag_blocked_segments[trackSequence]; int blockedSegments = monorail_diag_blocked_segments[trackSequence];
@ -1066,7 +1066,7 @@ static void paint_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8
} }
if (trackSequence == 3) { if (trackSequence == 3) {
metal_b_supports_paint_setup(3, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
int blockedSegments = monorail_diag_blocked_segments[trackSequence]; int blockedSegments = monorail_diag_blocked_segments[trackSequence];

134
src/openrct2/ride/transport/suspended_monorail.c
View File

@ -42,7 +42,7 @@ static void suspended_monorail_track_flat(uint8 rideIndex, uint8 trackSequence,
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); paint_util_push_tunnel_rotated(direction, height, TUNNEL_9);
@ -91,16 +91,16 @@ static void suspended_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSeque
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 6, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 8, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 7, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 5, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -135,16 +135,16 @@ static void suspended_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 8, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 7, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 5, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -179,16 +179,16 @@ static void suspended_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 6, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 8, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 7, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 5, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
} }
@ -240,7 +240,7 @@ static void suspended_monorail_track_left_quarter_turn_5(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); paint_util_push_tunnel_rotated(direction, height, TUNNEL_9);
@ -324,7 +324,7 @@ static void suspended_monorail_track_left_quarter_turn_5(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -367,7 +367,7 @@ static void suspended_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSeq
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); paint_util_push_tunnel_rotated(direction, height, TUNNEL_9);
@ -393,10 +393,10 @@ static void suspended_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSeq
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 5, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 6, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -421,10 +421,10 @@ static void suspended_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSeq
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 2: case 2:
metal_a_supports_paint_setup(3, 5, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 6, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -447,7 +447,7 @@ static void suspended_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSeq
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
@ -483,7 +483,7 @@ static void suspended_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSe
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); paint_util_push_tunnel_rotated(direction, height, TUNNEL_9);
@ -509,10 +509,10 @@ static void suspended_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSe
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 8, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 7, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -537,10 +537,10 @@ static void suspended_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSe
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 2: case 2:
metal_a_supports_paint_setup(3, 8, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 7, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -563,7 +563,7 @@ static void suspended_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSe
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 1: case 1:
@ -599,7 +599,7 @@ static void suspended_monorail_track_left_quarter_turn_3(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); paint_util_push_tunnel_rotated(direction, height, TUNNEL_9);
@ -644,7 +644,7 @@ static void suspended_monorail_track_left_quarter_turn_3(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
switch (direction) { switch (direction) {
case 2: case 2:
@ -687,7 +687,7 @@ static void suspended_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); paint_util_push_tunnel_rotated(direction, height, TUNNEL_9);
@ -753,16 +753,16 @@ static void suspended_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -792,7 +792,7 @@ static void suspended_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
metal_a_supports_paint_setup(3, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
paint_util_push_tunnel_rotated(direction, height, TUNNEL_9); paint_util_push_tunnel_rotated(direction, height, TUNNEL_9);
@ -858,16 +858,16 @@ static void suspended_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -931,16 +931,16 @@ static void suspended_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSeque
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -990,16 +990,16 @@ static void suspended_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 track
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 55, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 55, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 55, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 55, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 55, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 55, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1049,16 +1049,16 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uin
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1108,16 +1108,16 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uin
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1167,16 +1167,16 @@ static void suspended_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 tra
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 58, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1223,16 +1223,16 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, u
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
break; break;
@ -1282,16 +1282,16 @@ static void suspended_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, u
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF, 0);
switch (direction) { switch (direction) {
case 0: case 0:
metal_a_supports_paint_setup(3, 1, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 1, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 1: case 1:
metal_a_supports_paint_setup(3, 0, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 0, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 2: case 2:
metal_a_supports_paint_setup(3, 2, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 2, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(3, 3, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 3, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }

72
src/openrct2/ride/water/dingy_slide.c
View File

@ -380,7 +380,7 @@ static void dinghy_slide_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -401,8 +401,8 @@ static void dinghy_slide_track_station(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, imageIds[direction][0] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); sub_98197C_rotated(direction, imageIds[direction][0] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3);
sub_98196C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); sub_98196C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
metal_a_supports_paint_setup(0, 5 + (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5 + (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(0, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement); track_paint_util_draw_station(rideIndex, trackSequence, direction, height, mapElement);
@ -437,7 +437,7 @@ static void dinghy_slide_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -466,7 +466,7 @@ static void dinghy_slide_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -504,7 +504,7 @@ static void dinghy_slide_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -533,7 +533,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -562,7 +562,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -600,7 +600,7 @@ static void dinghy_slide_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -707,7 +707,7 @@ static void dinghy_slide_track_right_quarter_turn_5(uint8 rideIndex, uint8 track
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 6: case 6:
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -776,7 +776,7 @@ static void dinghy_slide_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
case 0: case 0:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 1: case 1:
@ -784,7 +784,7 @@ static void dinghy_slide_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 0 || direction == 1) { if (direction == 0 || direction == 1) {
metal_a_supports_paint_setup(0, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
@ -793,14 +793,14 @@ static void dinghy_slide_track_s_bend_left(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 2 || direction == 3) { if (direction == 2 || direction == 3) {
metal_a_supports_paint_setup(0, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
} }
@ -848,7 +848,7 @@ static void dinghy_slide_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
case 0: case 0:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 1: case 1:
@ -856,7 +856,7 @@ static void dinghy_slide_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 0 || direction == 1) { if (direction == 0 || direction == 1) {
metal_a_supports_paint_setup(0, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
break; break;
@ -865,14 +865,14 @@ static void dinghy_slide_track_s_bend_right(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 2 || direction == 3) { if (direction == 2 || direction == 3) {
metal_a_supports_paint_setup(0, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
} }
@ -944,7 +944,7 @@ static void dinghy_slide_track_right_quarter_turn_3(uint8 rideIndex, uint8 track
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 3: case 3:
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -981,7 +981,7 @@ static void dinghy_slide_track_flat_covered(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -1006,7 +1006,7 @@ static void dinghy_slide_track_25_deg_up_covered(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -1035,7 +1035,7 @@ static void dinghy_slide_track_60_deg_up_covered(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -1064,7 +1064,7 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(uint8 rideIndex, uint8
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -1093,7 +1093,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(uint8 rideIndex, u
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -1122,7 +1122,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(uint8 rideIndex, u
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -1151,7 +1151,7 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(uint8 rideIndex, uint8
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(0, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -1258,7 +1258,7 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(uint8 rideIndex, uin
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 6: case 6:
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }
@ -1322,7 +1322,7 @@ static void dinghy_slide_track_s_bend_left_covered(uint8 rideIndex, uint8 trackS
case 0: case 0:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 1: case 1:
@ -1330,7 +1330,7 @@ static void dinghy_slide_track_s_bend_left_covered(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 0 || direction == 1) { if (direction == 0 || direction == 1) {
metal_a_supports_paint_setup(0, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
@ -1339,14 +1339,14 @@ static void dinghy_slide_track_s_bend_left_covered(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 2 || direction == 3) { if (direction == 2 || direction == 3) {
metal_a_supports_paint_setup(0, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
} }
@ -1394,7 +1394,7 @@ static void dinghy_slide_track_s_bend_right_covered(uint8 rideIndex, uint8 track
case 0: case 0:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 1: case 1:
@ -1402,7 +1402,7 @@ static void dinghy_slide_track_s_bend_right_covered(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 0 || direction == 1) { if (direction == 0 || direction == 1) {
metal_a_supports_paint_setup(0, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
break; break;
@ -1411,14 +1411,14 @@ static void dinghy_slide_track_s_bend_right_covered(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 2 || direction == 3) { if (direction == 2 || direction == 3) {
metal_a_supports_paint_setup(0, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
} }
@ -1490,7 +1490,7 @@ static void dinghy_slide_track_right_quarter_turn_3_covered(uint8 rideIndex, uin
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
case 3: case 3:
metal_a_supports_paint_setup(0, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
break; break;
} }

52
src/openrct2/ride/water/log_flume.c
View File

@ -177,7 +177,7 @@ static void paint_log_flume_track_flat(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 26, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -198,11 +198,11 @@ static void paint_log_flume_track_station(uint8 rideIndex, uint8 trackSequence,
sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation()); sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation());
if (direction & 1) { if (direction & 1) {
metal_a_supports_paint_setup(3, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 7, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(3, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5, 0, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(3, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
track_paint_util_draw_station_3(rideIndex, trackSequence, direction, height + 2, height, mapElement); track_paint_util_draw_station_3(rideIndex, trackSequence, direction, height + 2, height, mapElement);
@ -231,7 +231,7 @@ static void paint_log_flume_track_25_deg_up(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -260,7 +260,7 @@ static void paint_log_flume_track_flat_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -289,7 +289,7 @@ static void paint_log_flume_track_25_deg_up_to_flat(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -318,7 +318,7 @@ static void paint_log_flume_track_25_deg_down(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -347,7 +347,7 @@ static void paint_log_flume_track_flat_to_25_deg_down(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -376,7 +376,7 @@ static void paint_log_flume_track_25_deg_down_to_flat(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) { if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
metal_a_supports_paint_setup(3, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
} }
if (direction == 0 || direction == 3) { if (direction == 0 || direction == 3) {
@ -418,7 +418,7 @@ static void paint_log_flume_track_s_bend_left(uint8 rideIndex, uint8 trackSequen
case 0: case 0:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 1: case 1:
@ -426,7 +426,7 @@ static void paint_log_flume_track_s_bend_left(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 0 || direction == 1) { if (direction == 0 || direction == 1) {
metal_a_supports_paint_setup(3, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
@ -435,14 +435,14 @@ static void paint_log_flume_track_s_bend_left(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 2 || direction == 3) { if (direction == 2 || direction == 3) {
metal_a_supports_paint_setup(3, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 5 + (direction & 1), (direction & 1), height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
} }
@ -490,7 +490,7 @@ static void paint_log_flume_track_s_bend_right(uint8 rideIndex, uint8 trackSeque
case 0: case 0:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 1: case 1:
@ -498,7 +498,7 @@ static void paint_log_flume_track_s_bend_right(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 0 || direction == 1) { if (direction == 0 || direction == 1) {
metal_a_supports_paint_setup(3, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
break; break;
@ -507,14 +507,14 @@ static void paint_log_flume_track_s_bend_right(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27);
if (direction == 2 || direction == 3) { if (direction == 2 || direction == 3) {
metal_a_supports_paint_setup(3, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 8 - (direction & 1), 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 27, 0, height, 0, 2, height + 27);
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
break; break;
} }
@ -554,7 +554,7 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(uint8 rideIndex, uin
track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(0, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], imageIdsFront, get_current_rotation(), 27); track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(0, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], imageIdsFront, get_current_rotation(), 27);
if (trackSequence != 1 && trackSequence != 2) { if (trackSequence != 1 && trackSequence != 2) {
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
switch (trackSequence) { switch (trackSequence) {
@ -601,7 +601,7 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(uint8 rideIndex, ui
track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(0, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], imageIdsFront, get_current_rotation(), 27); track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(0, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], imageIdsFront, get_current_rotation(), 27);
if (trackSequence != 1 && trackSequence != 2) { if (trackSequence != 1 && trackSequence != 2) {
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
} }
switch (trackSequence) { switch (trackSequence) {
@ -632,11 +632,11 @@ static void paint_log_flume_track_on_ride_photo(uint8 rideIndex, uint8 trackSequ
sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation()); sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation());
if (direction & 1) { if (direction & 1) {
metal_a_supports_paint_setup(2, 6, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 6, 6, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(2, 7, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 7, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} else { } else {
metal_a_supports_paint_setup(1, 5, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 5, 6, height, gTrackColours[SCHEME_SUPPORTS]);
metal_a_supports_paint_setup(1, 8, 6, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 8, 6, height, gTrackColours[SCHEME_SUPPORTS]);
} }
imageId = LogFlumeTrackFlatImageIds[direction][0] | gTrackColours[SCHEME_TRACK]; imageId = LogFlumeTrackFlatImageIds[direction][0] | gTrackColours[SCHEME_TRACK];
@ -668,7 +668,7 @@ static void paint_log_flume_track_reverser(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 26, height, 0, 27, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 26, height, 0, 27, height);
metal_a_supports_paint_setup(3, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0); paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);

4
src/openrct2/ride/water/submarine_ride.c
View File

@ -125,14 +125,14 @@ static void submarine_ride_paint_track_left_quarter_turn_3_tiles(uint8 rideIndex
switch (trackSequence) { switch (trackSequence) {
case 0: case 0:
metal_a_supports_paint_setup(4, 4, -1, height - 16, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -1, height - 16, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction), 0xFFFF, 0);
break; break;
case 2: case 2:
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8, direction), 0xFFFF, 0);
break; break;
case 3: case 3:
metal_a_supports_paint_setup(4, 4, -1, height - 16, gTrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(METAL_SUPPORTS_STICK, 4, -1, height - 16, gTrackColours[SCHEME_SUPPORTS]);
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0, direction), 0xFFFF, 0);
break; break;
} }