diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 7efb2573bc..8d37d650b4 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -3445,7 +3445,7 @@ namespace OpenRCT2::Ui::Windows _previousTrackPiece = _currentTrackBegin; // search for appropriate z value for ghost, up to max ride height - int numAttempts = (z <= MAX_TRACK_HEIGHT ? ((MAX_TRACK_HEIGHT - z) / kCoordsZStep + 1) : 2); + int numAttempts = (z <= kMaximumTrackHeight ? ((kMaximumTrackHeight - z) / kCoordsZStep + 1) : 2); if (rtd.specialType == RtdSpecialType::maze) { @@ -3676,7 +3676,7 @@ namespace OpenRCT2::Ui::Windows } // search for z value to build at, up to max ride height - int numAttempts = (z <= MAX_TRACK_HEIGHT ? ((MAX_TRACK_HEIGHT - z) / kCoordsZStep + 1) : 2); + int numAttempts = (z <= kMaximumTrackHeight ? ((kMaximumTrackHeight - z) / kCoordsZStep + 1) : 2); const auto& rtd = ride->getRideTypeDescriptor(); if (rtd.specialType == RtdSpecialType::maze) diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 8f88e63849..86e7b255e7 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -254,7 +254,7 @@ namespace OpenRCT2::GameActions clearanceZ = floor2(clearanceZ, kCoordsZStep) + baseZ; - if (clearanceZ > MAX_TRACK_HEIGHT) + if (clearanceZ > kMaximumTrackHeight) { return Result(Status::invalidParameters, STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE, STR_TOO_HIGH); } diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 3d8bd38650..101fbea2d7 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -223,7 +223,7 @@ enum }; constexpr int8_t kMaxStationPlatformLength = 32; -constexpr uint16_t const MAX_TRACK_HEIGHT = 254 * kCoordsZStep; +constexpr uint16_t kMaximumTrackHeight = 254 * kCoordsZStep; constexpr uint8_t const DEFAULT_SEAT_ROTATION = 4; enum class TrackCurve : uint8_t