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

Rename edges_2x2 to kEdges2x2

Browse Source
This commit is contained in:
Harry-Hopkinson
2024-04-28 14:08:02 +00:00
parent b795d4ba8a
commit 97e9634a61
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,13 +50,6 @@ static constexpr TileCoordsXY EntranceOffsetEdgeNW[] = {
{ -1, 0 },
};
const uint8_t edges_2x2[] = {
EDGE_NE | EDGE_NW,
EDGE_NE | EDGE_SE,
EDGE_SW | EDGE_NW,
EDGE_SW | EDGE_SE,
};
const uint8_t track_map_3x3[][9] = {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8 },
{ 0, 3, 5, 7, 2, 8, 1, 6, 4 },

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

@@ -23,7 +23,12 @@ constexpr uint8_t kTrackMap2x2[][4] = {
{ 3, 2, 1, 0 },
{ 2, 0, 3, 1 },
};
extern const uint8_t edges_2x2[];
constexpr uint8_t kEdges2x2[] = {
EDGE_NE | EDGE_NW,
EDGE_NE | EDGE_SE,
EDGE_SW | EDGE_NW,
EDGE_SW | EDGE_SE,
};
extern const uint8_t track_map_3x3[][9];
extern const uint8_t edges_3x3[];

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

@@ -202,7 +202,7 @@ static void PaintSpiralSlide(
trackSequence = kTrackMap2x2[direction][trackSequence];
int32_t edges = edges_2x2[trackSequence];
int32_t edges = kEdges2x2[trackSequence];
WoodenASupportsPaintSetupRotated(
session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height,

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

@@ -106,7 +106,7 @@ static void PaintMotionSimulator(
{
trackSequence = kTrackMap2x2[direction][trackSequence];
int32_t edges = edges_2x2[trackSequence];
int32_t edges = kEdges2x2[trackSequence];
auto stationColour = GetStationColourScheme(session, trackElement);
WoodenASupportsPaintSetupRotated(