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

Rename track_map_2x2 to kTrackMap2x2

This commit is contained in:
Harry-Hopkinson 2024-04-28 14:04:26 +00:00
parent 9266a6f0d3
commit b795d4ba8a
4 changed files with 8 additions and 10 deletions
Show Stats 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 track_map_2x2[][4] = {
{ 0, 1, 2, 3 },
{ 1, 3, 0, 2 },
{ 3, 2, 1, 0 },
{ 2, 0, 3, 1 },
};
const uint8_t edges_2x2[] = {
EDGE_NE | EDGE_NW,
EDGE_NE | EDGE_SE,

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

@ -17,7 +17,12 @@
class StationObject;
extern const uint8_t track_map_2x2[][4];
constexpr uint8_t kTrackMap2x2[][4] = {
{ 0, 1, 2, 3 },
{ 1, 3, 0, 2 },
{ 3, 2, 1, 0 },
{ 2, 0, 3, 1 },
};
extern const uint8_t edges_2x2[];
extern const uint8_t track_map_3x3[][9];

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

@ -200,7 +200,7 @@ static void PaintSpiralSlide(
if (rideEntry == nullptr)
return;
trackSequence = track_map_2x2[direction][trackSequence];
trackSequence = kTrackMap2x2[direction][trackSequence];
int32_t edges = edges_2x2[trackSequence];

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

@ -104,7 +104,7 @@ static void PaintMotionSimulator(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
trackSequence = track_map_2x2[direction][trackSequence];
trackSequence = kTrackMap2x2[direction][trackSequence];
int32_t edges = edges_2x2[trackSequence];