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

Rename track_map_4x4 to kTrackMap4x4

This commit is contained in:
Harry-Hopkinson 2024-04-28 14:26:12 +00:00
parent 8eebcc5486
commit b9003d6e60
5 changed files with 9 additions and 11 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_4x4[][16] = {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
{ 3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12 },
{ 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 },
};
// clang-format off
const uint8_t edges_4x4[] = {
EDGE_NE | EDGE_NW,

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

@ -50,7 +50,12 @@ constexpr uint8_t kEdges3x3[] = {
};
// clang-format on
extern const uint8_t track_map_4x4[][16];
constexpr uint8_t kTrackMap4x4[][16] = {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
{ 3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12 },
{ 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[];
extern const uint8_t track_map_1x4[][4];

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

@ -47,7 +47,7 @@ static void PaintDodgems(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
uint8_t relativeTrackSequence = track_map_4x4[direction][trackSequence];
uint8_t relativeTrackSequence = kTrackMap4x4[direction][trackSequence];
int32_t edges = edges_4x4[relativeTrackSequence];

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

@ -38,7 +38,7 @@ static void PaintFlyingSaucers(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
uint8_t relativeTrackSequence = track_map_4x4[direction][trackSequence];
uint8_t relativeTrackSequence = kTrackMap4x4[direction][trackSequence];
int32_t edges = edges_4x4[relativeTrackSequence];

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

@ -91,7 +91,7 @@ static void PaintEnterprise(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
trackSequence = track_map_4x4[direction][trackSequence];
trackSequence = kTrackMap4x4[direction][trackSequence];
int32_t edges = edges_4x4[trackSequence];