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

Rename track_map_1x4 to kTrackMap1x4

This commit is contained in:
Harry-Hopkinson 2024-04-28 14:33:41 +00:00
parent d6efe4cd53
commit 52ad6861af
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

@ -64,13 +64,6 @@ const MetalSupportPlace DiagSupportPlacement[] = {
MetalSupportPlace::BottomCorner,
};
const uint8_t track_map_1x4[][4] = {
{ 0, 1, 2, 3 },
{ 2, 3, 0, 1 },
{ 2, 3, 0, 1 },
{ 0, 1, 2, 3 },
};
const uint32_t floorSpritesCork[] = {
SPR_FLOOR_CORK_SE_SW,
SPR_FLOOR_CORK_SW,

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

@ -77,7 +77,12 @@ constexpr uint8_t kEdges4x4[] = {
};
// clang-format on
extern const uint8_t track_map_1x4[][4];
constexpr uint8_t kTrackMap1x4[][4] = {
{ 0, 1, 2, 3 },
{ 2, 3, 0, 1 },
{ 2, 3, 0, 1 },
{ 0, 1, 2, 3 },
};
extern const int32_t DiagBlockedSegments[];
extern const MetalSupportPlace DiagSupportPlacement[];

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

@ -104,7 +104,7 @@ static void PaintFerrisWheel(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
uint8_t relativeTrackSequence = kTrackMap1x4[direction][trackSequence];
int32_t edges;
if (direction & 1)

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

@ -213,7 +213,7 @@ static void PaintMagicCarpet(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
uint8_t relativeTrackSequence = kTrackMap1x4[direction][trackSequence];
// The end tiles do not have a platform
switch (relativeTrackSequence)

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

@ -127,7 +127,7 @@ static void PaintSwingingInverterShip(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
uint8_t relativeTrackSequence = kTrackMap1x4[direction][trackSequence];
ImageId imageId;
const StationObject* stationObject = ride.GetStationObject();