mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Rename MaxSequencesPerPiece to kMaxSequencesPerPiece

Browse Source
This commit is contained in:
Gymnasiast
2024-08-01 22:54:14 +02:00
parent 9294a58e98
commit a984532ff1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/ride/TrackData.cpp
View File

@@ -365,7 +365,7 @@ namespace OpenRCT2::TrackMetaData
static_assert(std::size(_trackCoordinates) == TrackElemType::Count);
/** rct2: 0x0099BA64 */
static constexpr uint8_t TrackSequenceProperties[][MaxSequencesPerPiece] = {
static constexpr uint8_t TrackSequenceProperties[][kMaxSequencesPerPiece] = {
{ 0 },
/* TrackElemType::EndStation */ { TRACK_SEQUENCE_FLAG_DIRECTION_1 | TRACK_SEQUENCE_FLAG_DIRECTION_3 | TRACK_SEQUENCE_FLAG_ORIGIN | TRACK_SEQUENCE_FLAG_DISALLOW_DOORS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
/* TrackElemType::BeginStation */ { TRACK_SEQUENCE_FLAG_DIRECTION_1 | TRACK_SEQUENCE_FLAG_DIRECTION_3 | TRACK_SEQUENCE_FLAG_ORIGIN | TRACK_SEQUENCE_FLAG_DISALLOW_DOORS, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -5622,7 +5622,7 @@ namespace OpenRCT2::TrackMetaData
static_assert(std::size(TrackHeightMarkerPositions) == TrackElemType::Count);
/** rct2: 0x00999A94 */
static constexpr uint8_t TrackSequenceElementAllowedWallEdges[][MaxSequencesPerPiece] = {
static constexpr uint8_t TrackSequenceElementAllowedWallEdges[][kMaxSequencesPerPiece] = {
{ 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::Flat
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::EndStation
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::BeginStation
@@ -8008,7 +8008,7 @@ namespace OpenRCT2::TrackMetaData
desc.verticalFactor = GetVerticalFunction(i);
desc.lateralFactor = GetLateralFunction(i);
for (uint8_t j = 0; j < MaxSequencesPerPiece; j++)
for (uint8_t j = 0; j < kMaxSequencesPerPiece; j++)
{
desc.sequenceElementAllowedWallEdges[j] = TrackSequenceElementAllowedWallEdges[i][j];
desc.sequenceProperties[j] = TrackSequenceProperties[i][j];

6
src/openrct2/ride/TrackData.h
View File

@@ -13,7 +13,7 @@
namespace OpenRCT2::TrackMetaData
{
constexpr uint8_t MaxSequencesPerPiece = 16;
constexpr uint8_t kMaxSequencesPerPiece = 16;
// 0x009968BB, 0x009968BC, 0x009968BD, 0x009968BF, 0x009968C1, 0x009968C3
@@ -89,8 +89,8 @@ namespace OpenRCT2::TrackMetaData
uint32_t heightMarkerPositions;
uint32_t flags;
std::array<uint8_t, MaxSequencesPerPiece> sequenceElementAllowedWallEdges;
std::array<uint8_t, MaxSequencesPerPiece> sequenceProperties;
std::array<uint8_t, kMaxSequencesPerPiece> sequenceElementAllowedWallEdges;
std::array<uint8_t, kMaxSequencesPerPiece> sequenceProperties;
TrackDefinition definition;
SpinFunction spinFunction;