mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Rename edges_4x4 to kEdges4x4

Browse Source
This commit is contained in:
Harry-Hopkinson
2024-04-28 14:31:29 +00:00
parent b9003d6e60
commit d6efe4cd53
5 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,27 +50,6 @@ static constexpr TileCoordsXY EntranceOffsetEdgeNW[] = {
{ -1, 0 },
};
// clang-format off
const uint8_t edges_4x4[] = {
EDGE_NE | EDGE_NW,
EDGE_NE,
EDGE_NE,
EDGE_NE | EDGE_SE,
EDGE_NW,
0,
0,
EDGE_SE,
EDGE_NW,
0,
0,
EDGE_SE,
EDGE_NW | EDGE_SW,
EDGE_SW,
EDGE_SW,
EDGE_SW | EDGE_SE,
};
// clang-format on
const int32_t DiagBlockedSegments[] = {
EnumsToFlags(PaintSegment::centre, PaintSegment::topRightSide, PaintSegment::bottomRightSide, PaintSegment::rightCorner),
EnumsToFlags(PaintSegment::centre, PaintSegment::topRightSide, PaintSegment::topLeftSide, PaintSegment::topCorner),

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

@@ -56,7 +56,26 @@ constexpr uint8_t kTrackMap4x4[][16] = {
{ 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
{ 12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3 },
};
extern const uint8_t edges_4x4[];
// clang-format off
constexpr uint8_t kEdges4x4[] = {
EDGE_NE | EDGE_NW,
EDGE_NE,
EDGE_NE,
EDGE_NE | EDGE_SE,
EDGE_NW,
0,
0,
EDGE_SE,
EDGE_NW,
0,
0,
EDGE_SE,
EDGE_NW | EDGE_SW,
EDGE_SW,
EDGE_SW,
EDGE_SW | EDGE_SE,
};
// clang-format on
extern const uint8_t track_map_1x4[][4];

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

@@ -49,7 +49,7 @@ static void PaintDodgems(
{
uint8_t relativeTrackSequence = kTrackMap4x4[direction][trackSequence];
int32_t edges = edges_4x4[relativeTrackSequence];
int32_t edges = kEdges4x4[relativeTrackSequence];
WoodenASupportsPaintSetupRotated(
session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height,

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

@@ -40,7 +40,7 @@ static void PaintFlyingSaucers(
{
uint8_t relativeTrackSequence = kTrackMap4x4[direction][trackSequence];
int32_t edges = edges_4x4[relativeTrackSequence];
int32_t edges = kEdges4x4[relativeTrackSequence];
WoodenASupportsPaintSetupRotated(
session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height,

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

@@ -93,7 +93,7 @@ static void PaintEnterprise(
{
trackSequence = kTrackMap4x4[direction][trackSequence];
int32_t edges = edges_4x4[trackSequence];
int32_t edges = kEdges4x4[trackSequence];
WoodenASupportsPaintSetupRotated(
session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height,