From c201a3bf182cac1c83ef10be0e0d05c70df78fc5 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Wed, 5 Jun 2024 20:31:24 +0000 Subject: [PATCH] Rename CoordsZStep to kCoordsZStep --- src/openrct2/rct1/Limits.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openrct2/rct1/Limits.h b/src/openrct2/rct1/Limits.h index 4ca69119fd..d2ac180623 100644 --- a/src/openrct2/rct1/Limits.h +++ b/src/openrct2/rct1/Limits.h @@ -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; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index b0bdefe2ab..7bded8c269 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -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(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)) {