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

Refactor more constants in TrackPaint.h (#21942)

This commit is contained in:
Harry Hopkinson 2024-05-09 10:41:47 +01:00 committed by GitHub
parent 47d0996b4f
commit 613d60b446
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 159 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,85 +51,6 @@ static constexpr TileCoordsXY EntranceOffsetEdgeNW[] = {
{ -1, 0 },
};
const MetalSupportPlace DiagSupportPlacement[] = {
MetalSupportPlace::LeftCorner,
MetalSupportPlace::TopCorner,
MetalSupportPlace::RightCorner,
MetalSupportPlace::BottomCorner,
};
const uint32_t floorSpritesCork[] = {
SPR_FLOOR_CORK_SE_SW,
SPR_FLOOR_CORK_SW,
SPR_FLOOR_CORK_SE,
SPR_FLOOR_CORK,
};
const uint32_t floorSpritesMetal[] = {
SPR_FLOOR_METAL,
SPR_FLOOR_METAL,
SPR_FLOOR_METAL,
SPR_FLOOR_METAL,
};
const uint32_t floorSpritesMetalB[] = {
SPR_FLOOR_METAL_B,
SPR_FLOOR_METAL_B,
SPR_FLOOR_METAL_B,
SPR_FLOOR_METAL_B,
};
const uint32_t fenceSpritesRope[] = {
SPR_FENCE_ROPE_NE,
SPR_FENCE_ROPE_SE,
SPR_FENCE_ROPE_SW,
SPR_FENCE_ROPE_NW,
};
const uint32_t fenceSpritesMetal[] = {
SPR_FENCE_METAL_NE,
SPR_FENCE_METAL_SE,
SPR_FENCE_METAL_SW,
SPR_FENCE_METAL_NW,
};
const uint32_t fenceSpritesMetalB[] = {
SPR_FENCE_METAL_B_NE,
SPR_FENCE_METAL_B_SE,
SPR_FENCE_METAL_B_SW,
SPR_FENCE_METAL_B_NW,
};
const uint32_t trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles[4][3] = {
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2,
},
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2,
},
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2,
},
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2,
}
};
const uint32_t trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile[4] = {
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_SW_NW,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_NW_NE,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_NE_SE,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_SE_SW,
};
static constexpr uint32_t trackSpritesGhostTrainSpinningTunnel[2][2][4] = {
{
{

79
src/openrct2/ride/TrackPaint.h
View File

@ -84,7 +84,12 @@ constexpr uint8_t kTrackMap1x4[][4] = {
{ 0, 1, 2, 3 },
};
extern const MetalSupportPlace DiagSupportPlacement[];
constexpr MetalSupportPlace kDiagSupportPlacement[] = {
MetalSupportPlace::LeftCorner,
MetalSupportPlace::TopCorner,
MetalSupportPlace::RightCorner,
MetalSupportPlace::BottomCorner,
};
enum
{
@ -290,16 +295,72 @@ enum
MAZE_ENTRY_FLAG_15 = (1 << 15),
};
extern const uint32_t floorSpritesCork[];
extern const uint32_t floorSpritesMetal[];
extern const uint32_t floorSpritesMetalB[];
constexpr uint32_t kFloorSpritesCork[] = {
SPR_FLOOR_CORK_SE_SW,
SPR_FLOOR_CORK_SW,
SPR_FLOOR_CORK_SE,
SPR_FLOOR_CORK,
};
constexpr uint32_t kFloorSpritesMetal[] = {
SPR_FLOOR_METAL,
SPR_FLOOR_METAL,
SPR_FLOOR_METAL,
SPR_FLOOR_METAL,
};
constexpr uint32_t kFloorSpritesMetalB[] = {
SPR_FLOOR_METAL_B,
SPR_FLOOR_METAL_B,
SPR_FLOOR_METAL_B,
SPR_FLOOR_METAL_B,
};
extern const uint32_t fenceSpritesRope[];
extern const uint32_t fenceSpritesMetal[];
extern const uint32_t fenceSpritesMetalB[];
constexpr uint32_t kFenceSpritesRope[] = {
SPR_FENCE_ROPE_NE,
SPR_FENCE_ROPE_SE,
SPR_FENCE_ROPE_SW,
SPR_FENCE_ROPE_NW,
};
constexpr uint32_t kFenceSpritesMetal[] = {
SPR_FENCE_METAL_NE,
SPR_FENCE_METAL_SE,
SPR_FENCE_METAL_SW,
SPR_FENCE_METAL_NW,
};
constexpr uint32_t kFenceSpritesMetalB[] = {
SPR_FENCE_METAL_B_NE,
SPR_FENCE_METAL_B_SE,
SPR_FENCE_METAL_B_SW,
SPR_FENCE_METAL_B_NW,
};
extern const uint32_t trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles[4][3];
extern const uint32_t trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile[4];
constexpr uint32_t kTrackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles[4][3] = {
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2,
},
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2,
},
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2,
},
{
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2,
}
};
constexpr uint32_t kTrackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile[4] = {
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_SW_NW,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_NW_NE,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_NE_SE,
SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_QUARTER_TURN_1_TILE_SE_SW,
};
extern const uint8_t mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[];
extern const Direction mapReversedDiagonalStraight[];

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

@ -14495,7 +14495,7 @@ static void BolligerMabillardTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(session, supportType, DiagSupportPlacement[direction], 0, height, session.SupportColours);
MetalASupportsPaintSetup(session, supportType, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -14514,7 +14514,7 @@ static void BolligerMabillardTrackDiagBlockBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(session, supportType, DiagSupportPlacement[direction], 0, height, session.SupportColours);
MetalASupportsPaintSetup(session, supportType, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];

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

@ -6685,7 +6685,7 @@ inline void CompactInvertedRCTrackDiagFlatBase(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::TubesInverted, DiagSupportPlacement[direction], 0, height + 38, session.SupportColours);
session, MetalSupportType::TubesInverted, kDiagSupportPlacement[direction], 0, height + 38, session.SupportColours);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}

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

@ -6526,7 +6526,7 @@ static void CorkscrewRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Tubes, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -6545,7 +6545,7 @@ static void CorkscrewRCTrackDiagBlockBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Tubes, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];

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

@ -10055,7 +10055,7 @@ static void FlyingRCTrackDiagBrakesInverted(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height + 39, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 0, height + 39, session.SupportColours);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}

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

@ -18255,7 +18255,7 @@ static void GigaRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Tubes, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);

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

@ -6396,7 +6396,7 @@ inline void InvertedRCTrackDiagFlatBase(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height + 44, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 0, height + 44, session.SupportColours);
}
PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20);
}

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

@ -4640,7 +4640,7 @@ static void JuniorRCPaintTrackDiagFlat(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4660,7 +4660,7 @@ static void JuniorRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4680,7 +4680,7 @@ static void JuniorRCTrackDiagBlockBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4702,7 +4702,7 @@ static void JuniorRCPaintTrackDiag25DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 8,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 8,
height, session.SupportColours);
}
@ -4724,7 +4724,7 @@ static void JuniorRCPaintTrackDiagFlatTo25DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4747,7 +4747,7 @@ static void JuniorRCPaintTrackDiagFlatTo60DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height + 6, session.SupportColours);
}
@ -4769,7 +4769,7 @@ static void JuniorRCPaintTrackDiag25DegUpToFlat(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height, session.SupportColours);
}
@ -4792,7 +4792,7 @@ static void JuniorRCPaintTrackDiag60DegUpToFlat(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height + 13, session.SupportColours);
}
@ -4814,7 +4814,7 @@ static void JuniorRCPaintTrackDiag25DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 8,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 8,
height, session.SupportColours);
}
@ -4836,7 +4836,7 @@ static void JuniorRCPaintTrackDiagFlatTo25DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height, session.SupportColours);
}
@ -4859,7 +4859,7 @@ static void JuniorRCPaintTrackDiagFlatTo60DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height + 7, session.SupportColours);
}
@ -4881,7 +4881,7 @@ static void JuniorRCPaintTrackDiag25DegDownToFlat(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4904,7 +4904,7 @@ static void JuniorRCPaintTrackDiag60DegDownToFlat(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4931,7 +4931,7 @@ static void JuniorRCDiagFlatToLeftBankPaintSetup(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4958,7 +4958,7 @@ static void JuniorRCDiagFlatToRightBankPaintSetup(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -4985,7 +4985,7 @@ static void JuniorRCDiagLeftBankToFlatPaintSetup(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5012,7 +5012,7 @@ static void JuniorRCDiagRightBankToFlatPaintSetup(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5039,7 +5039,7 @@ static void JuniorRCDiagLeftBankTo25DegUpPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5066,7 +5066,7 @@ static void JuniorRCDiagRightBankTo25DegUpPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5093,7 +5093,7 @@ static void JuniorRCDiag25DegUpToLeftBankPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height, session.SupportColours);
}
@ -5120,7 +5120,7 @@ static void JuniorRCDiag25DegUpToRightBankPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height, session.SupportColours);
}
@ -5147,7 +5147,7 @@ static void JuniorRCDiagLeftBankTo25DegDownPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height, session.SupportColours);
}
@ -5174,7 +5174,7 @@ static void JuniorRCDiagRightBankTo25DegDownPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 4,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 4,
height, session.SupportColours);
}
@ -5201,7 +5201,7 @@ static void JuniorRCDiag25DegDownToLeftBankPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5228,7 +5228,7 @@ static void JuniorRCDiag25DegDownToRightBankPaintSetup(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5264,7 +5264,7 @@ static void JuniorRCDiagLeftBankPaintSetup(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5286,7 +5286,7 @@ static void JuniorRCDiagRightBankPaintSetup(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 0,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 0,
height, session.SupportColours);
}
@ -5540,7 +5540,7 @@ static void JuniorRCPaintTrackDiag60DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 36,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 36,
height, session.SupportColours);
}
@ -5563,7 +5563,7 @@ static void JuniorRCPaintTrackDiag60DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 28,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 28,
height, session.SupportColours);
}
@ -5586,7 +5586,7 @@ static void JuniorRCPaintTrackDiag25DegUpTo60DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 16,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 16,
height, session.SupportColours);
}
@ -5619,7 +5619,7 @@ static void JuniorRCPaintTrackDiag60DegUpTo25DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 21,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 21,
height, session.SupportColours);
}
@ -5652,7 +5652,7 @@ static void JuniorRCPaintTrackDiag25DegDownTo60DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 17,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 17,
height, session.SupportColours);
}
@ -5675,7 +5675,7 @@ static void JuniorRCPaintTrackDiag60DegDownTo25DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, DiagSupportPlacement[direction], 8,
session, (direction & 1) ? MetalSupportType::ForkAlt : MetalSupportType::Fork, kDiagSupportPlacement[direction], 8,
height, session.SupportColours);
}

4
src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp
View File

@ -3917,7 +3917,7 @@ static void LayDownRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::TubesInverted, DiagSupportPlacement[direction], 0, height + 33, session.SupportColours);
session, MetalSupportType::TubesInverted, kDiagSupportPlacement[direction], 0, height + 33, session.SupportColours);
}
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
@ -3937,7 +3937,7 @@ static void LayDownRCTrackDiagBlockBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::TubesInverted, DiagSupportPlacement[direction], 0, height + 33, session.SupportColours);
session, MetalSupportType::TubesInverted, kDiagSupportPlacement[direction], 0, height + 33, session.SupportColours);
}
PaintUtilSetGeneralSupportHeight(session, height + 33, 0x20);
}

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

@ -5942,7 +5942,7 @@ static void LoopingRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Tubes, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);

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

@ -7663,7 +7663,7 @@ static void MultiDimensionRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::TubesInverted, DiagSupportPlacement[direction], 0, height + 36,
session, MetalSupportType::TubesInverted, kDiagSupportPlacement[direction], 0, height + 36,
session.SupportColours);
}
}
@ -7676,7 +7676,7 @@ static void MultiDimensionRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::TubesInverted, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::TubesInverted, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0);
@ -7701,7 +7701,7 @@ static void MultiDimensionRCTrackDiagBlockBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::TubesInverted, DiagSupportPlacement[direction], 0, height + 36,
session, MetalSupportType::TubesInverted, kDiagSupportPlacement[direction], 0, height + 36,
session.SupportColours);
}
}
@ -7714,7 +7714,7 @@ static void MultiDimensionRCTrackDiagBlockBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::TubesInverted, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::TubesInverted, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0);

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

@ -6197,7 +6197,7 @@ static void StandUpRCTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 8, height, session.SupportColours);
session, MetalSupportType::Tubes, kDiagSupportPlacement[direction], 8, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -6216,7 +6216,7 @@ static void StandUpRCTrackDiagBlockBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 8, height, session.SupportColours);
session, MetalSupportType::Tubes, kDiagSupportPlacement[direction], 8, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];

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

@ -1556,7 +1556,7 @@ static void SteeplechaseTrackDiagBrakes(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Stick, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Stick, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];

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

@ -62,10 +62,10 @@ static void PaintCircus(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, fenceSpritesRope,
session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, kFenceSpritesRope,
session.CurrentRotation);
auto stationColour = GetStationColourScheme(session, trackElement);

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

@ -95,11 +95,11 @@ static void PaintCrookedHouse(
GetStationColourScheme(session, trackElement));
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height,
fenceSpritesRope, session.CurrentRotation);
kFenceSpritesRope, session.CurrentRotation);
auto stationColour = GetStationColourScheme(session, trackElement);
switch (trackSequence)

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

@ -124,7 +124,7 @@ static void PaintFerrisWheel(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
ImageId imageId;
uint8_t rotation = session.CurrentRotation;

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

@ -76,11 +76,11 @@ static void PaintHauntedHouse(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height,
fenceSpritesRope, session.CurrentRotation);
kFenceSpritesRope, session.CurrentRotation);
auto stationColour = GetStationColourScheme(session, trackElement);
switch (trackSequence)

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

@ -117,11 +117,11 @@ static void PaintMerryGoRound(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height,
fenceSpritesRope, session.CurrentRotation);
kFenceSpritesRope, session.CurrentRotation);
auto stationColour = GetStationColourScheme(session, trackElement);
switch (trackSequence)

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

@ -253,7 +253,7 @@ static void PaintMiniHelicoptersTrackLeftQuarterTurn3Tiles(
{
TrackPaintUtilLeftQuarterTurn3TilesPaint(
session, 3, height, direction, trackSequence, session.TrackColours,
trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles);
kTrackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles);
TrackPaintUtilLeftQuarterTurn3TilesTunnel(session, height, TUNNEL_0, direction, trackSequence);
switch (trackSequence)
@ -319,7 +319,7 @@ static void PaintMiniHelicoptersTrackLeftQuarterTurn1Tile(
const TrackElement& trackElement)
{
TrackPaintUtilLeftQuarterTurn1TilePaint(
session, 1, height, 0, direction, session.TrackColours, trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile);
session, 1, height, 0, direction, session.TrackColours, kTrackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile);
TrackPaintUtilLeftQuarterTurn1TileTunnel(session, direction, height, 0, TUNNEL_0, 0, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(

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

@ -96,10 +96,10 @@ static void PaintObservationTowerBase(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, floorSpritesMetalB, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, kFloorSpritesMetalB, stationObject);
TrackPaintUtilPaintFences(
session, edges, position, trackElement, ride, session.TrackColours, height, fenceSpritesMetalB,
session, edges, position, trackElement, ride, session.TrackColours, height, kFenceSpritesMetalB,
session.CurrentRotation);
if (trackSequence == 0)

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

@ -101,7 +101,7 @@ static void PaintSpaceRings(
session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour);
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
switch (trackSequence)
{

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

@ -64,10 +64,10 @@ static void Paint3dCinema(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, stationColour, height, fenceSpritesRope,
session, edges, session.MapPosition, trackElement, ride, stationColour, height, kFenceSpritesRope,
session.CurrentRotation);
switch (trackSequence)

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

@ -102,10 +102,10 @@ static void PaintEnterprise(
GetStationColourScheme(session, trackElement));
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, fenceSpritesRope,
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, kFenceSpritesRope,
session.CurrentRotation);
switch (trackSequence)

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

@ -102,10 +102,10 @@ static void PaintLaunchedFreefallBase(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, floorSpritesMetal, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, kFloorSpritesMetal, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, fenceSpritesMetal,
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, kFenceSpritesMetal,
session.CurrentRotation);
if (trackSequence == 0)

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

@ -116,10 +116,10 @@ static void PaintMotionSimulator(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, fenceSpritesRope,
session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, kFenceSpritesRope,
session.CurrentRotation);
switch (trackSequence)

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

@ -115,10 +115,10 @@ static void PaintRotoDropBase(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, floorSpritesMetalB, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, kFloorSpritesMetalB, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, fenceSpritesMetalB,
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, kFenceSpritesMetalB,
session.CurrentRotation);
if (trackSequence == 0)

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

@ -194,10 +194,10 @@ static void PaintTopSpin(
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject);
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, stationColour, height, fenceSpritesRope,
session, edges, session.MapPosition, trackElement, ride, stationColour, height, kFenceSpritesRope,
session.CurrentRotation);
switch (trackSequence)

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

@ -98,7 +98,7 @@ static void PaintTwist(
session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour);
const StationObject* stationObject = ride.GetStationObject();
TrackPaintUtilPaintFloor(session, edges, stationColour, height, floorSpritesCork, stationObject);
TrackPaintUtilPaintFloor(session, edges, stationColour, height, kFloorSpritesCork, stationObject);
switch (trackSequence)
{
@ -117,7 +117,7 @@ static void PaintTwist(
default:
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height,
fenceSpritesRope, session.CurrentRotation);
kFenceSpritesRope, session.CurrentRotation);
break;
}

2
src/openrct2/ride/transport/Lift.cpp
View File

@ -76,7 +76,7 @@ static void PaintLiftBase(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 0, 0, height }, { 32, 32, 1 } });
TrackPaintUtilPaintFences(
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, fenceSpritesMetalB,
session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, kFenceSpritesMetalB,
session.CurrentRotation);
int32_t blockedSegments = 0;

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

@ -1167,7 +1167,7 @@ static void PaintMonorailTrackDiagFlat(
if (trackSequence == 3)
{
MetalASupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -1189,7 +1189,7 @@ static void PaintMonorailTrackDiag25DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 8, height, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 8, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -1211,7 +1211,7 @@ static void PaintMonorailTrackDiagFlatTo25DegUp(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -1233,7 +1233,7 @@ static void PaintMonorailTrackDiag25DegUpToFlat(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 4, height, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 4, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -1255,7 +1255,7 @@ static void PaintMonorailTrackDiag25DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 8, height, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 8, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -1277,7 +1277,7 @@ static void PaintMonorailTrackDiagFlatTo25DegDown(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 4, height, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 4, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];
@ -1299,7 +1299,7 @@ static void PaintMonorailTrackDiag25DegDownToFlat(
if (trackSequence == 3)
{
MetalBSupportsPaintSetup(
session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height, session.SupportColours);
session, MetalSupportType::Boxed, kDiagSupportPlacement[direction], 0, height, session.SupportColours);
}
int32_t blockedSegments = BlockedSegments::kDiagStraightFlat[trackSequence];

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

@ -138,7 +138,7 @@ static void SubmarineRidePaintTrackLeftQuarterTurn3Tiles(
{
TrackPaintUtilLeftQuarterTurn3TilesPaint(
session, 3, height - 16, direction, trackSequence, session.TrackColours,
trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles);
kTrackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles);
TrackPaintUtilLeftQuarterTurn3TilesTunnel(session, height - 16, TUNNEL_0, direction, trackSequence);
switch (trackSequence)
@ -201,7 +201,7 @@ static void SubmarineRidePaintTrackLeftQuarterTurn1Tile(
const TrackElement& trackElement)
{
TrackPaintUtilLeftQuarterTurn1TilePaint(
session, 1, height - 16, 0, direction, session.TrackColours, trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile);
session, 1, height - 16, 0, direction, session.TrackColours, kTrackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile);
TrackPaintUtilLeftQuarterTurn1TileTunnel(session, direction, height - 16, 0, TUNNEL_0, 0, TUNNEL_0);
PaintUtilSetSegmentSupportHeight(