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

Small fixes

This commit is contained in:
Gymnasiast 2024-05-01 17:32:33 +02:00 committed by Spacek531
parent 2b9e714f15
commit 0327e261d1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/Track.h
View File

@ -21,11 +21,9 @@ constexpr uint32_t RideConstructionSpecialPieceSelected = 0x10000;
constexpr uint8_t kRCT2DefaultBlockBrakeSpeed = 2;
constexpr int32_t kBlockBrakeBaseSpeed = 0x20364;
constexpr int32_t kBlockBrakeSpeedOffset = kBlockBrakeBaseSpeed - (kRCT2DefaultBlockBrakeSpeed << 16);
constexpr uint8_t const kLegacyBrakeSpeedMultiplier = 2;
constexpr uint8_t const kLegacyBrakeSpeedMask = 0b00011110;
constexpr uint8_t const kMaximumBrakeSpeed = 0b00111111; // 2 high bits reserved for potential future behavior
constexpr uint8_t kMaximumBrakeSpeed = 30;
constexpr uint8_t kLegacyBrakeSpeedMultiplier = 2;
constexpr uint8_t kLegacyBrakeSpeedMask = 0b00011110;
constexpr uint8_t kMaximumBrakeSpeed = 0b00111111; // 2 high bits reserved for potential future behavior
using track_type_t = uint16_t;

4
src/openrct2/ride/TrackDesign.cpp
View File

@ -237,12 +237,12 @@ ResultWithMessage TrackDesign::CreateTrackDesignTrack(TrackDesignState& tds, con
trackFlags = ride.GetRideTypeDescriptor().GetRelativeBoosterSpeed(trackFlags);
}
// check to ensure the value is serializable. This warning will not apply to new track design format
// check to ensure the value is serialisable. This warning will not apply to new track design format.
bool tooHigh = trackFlags > kLegacyBrakeSpeedMask;
bool tooPrecise = trackFlags & 1;
if (tooPrecise || tooHigh)
{
warningMessage = STR_TRACK_DESIGN_SPEED_UNSERIALIZABLE;
warningMessage = STR_TRACK_DESIGN_SPEED_UNSERIALISABLE;
}
if (tooPrecise)
{