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

Rename CoordsZStep to kCoordsZStep

Browse Source
This commit is contained in:
Harry-Hopkinson
2024-06-05 20:31:24 +00:00
committed by Harry Hopkinson
parent 45f1a8e360
commit c201a3bf18
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/rct1/Limits.h
View File

@@ -20,7 +20,7 @@ namespace RCT1::Limits
constexpr uint8_t kMaxStaff = 116;
constexpr uint16_t kMaxAnimatedObjects = 1000;
constexpr uint8_t kMaxBanners = 100;
constexpr int32_t CoordsZStep = 4;
constexpr int32_t kCoordsZStep = 4;
constexpr uint32_t Num_LL_CSG_Entries = 69917;
constexpr uint32_t LL_CSG1_DAT_FileSize = 41402869;
constexpr uint32_t NumTerrainSurfaces = 16;

12
src/openrct2/rct1/S4Importer.cpp
View File

@@ -885,7 +885,7 @@ namespace RCT1
auto tileStartLoc = TileCoordsXY{ src->StationStarts[i].x, src->StationStarts[i].y };
dstStation.Start = tileStartLoc.ToCoordsXY();
}
dstStation.SetBaseZ(src->StationHeights[i] * Limits::CoordsZStep);
dstStation.SetBaseZ(src->StationHeights[i] * Limits::kCoordsZStep);
dstStation.Length = src->StationLengths[i];
dstStation.Depart = src->StationLights[i];
@@ -1321,7 +1321,7 @@ namespace RCT1
dst->State = static_cast<PeepState>(src->State);
dst->SubState = src->SubState;
dst->NextLoc = { src->NextX, src->NextY, src->NextZ * Limits::CoordsZStep };
dst->NextLoc = { src->NextX, src->NextY, src->NextZ * Limits::kCoordsZStep };
dst->NextFlags = src->NextFlags;
dst->Var37 = src->Var37;
dst->StepProgress = src->StepProgress;
@@ -1583,8 +1583,8 @@ namespace RCT1
// This flag will be set by the caller.
dst->SetLastForTile(false);
dst->SetBaseZ(src->BaseHeight * Limits::CoordsZStep);
dst->SetClearanceZ(src->ClearanceHeight * Limits::CoordsZStep);
dst->SetBaseZ(src->BaseHeight * Limits::kCoordsZStep);
dst->SetClearanceZ(src->ClearanceHeight * Limits::kCoordsZStep);
switch (tileElementType)
{
@@ -1793,8 +1793,8 @@ namespace RCT1
ConvertWall(type, &colourA, &colourB);
type = _wallTypeToEntryMap[type];
auto baseZ = src->BaseHeight * Limits::CoordsZStep;
auto clearanceZ = src->ClearanceHeight * Limits::CoordsZStep;
auto baseZ = src->BaseHeight * Limits::kCoordsZStep;
auto clearanceZ = src->ClearanceHeight * Limits::kCoordsZStep;
auto edgeSlope = GetWallSlopeFromEdgeSlope(slope, edge & 3);
if (edgeSlope & (EDGE_SLOPE_UPWARDS | EDGE_SLOPE_DOWNWARDS))
{