diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index f0cb661dba..e6d11f3440 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -219,7 +219,7 @@ static Widget _rideConstructionWidgets[] = { ShowGridlines(); _currentTrackPrice = kMoney64Undefined; - _currentBrakeSpeed2 = 8; + _currentBrakeSpeed = 8; _currentSeatRotationAngle = 4; _currentTrackCurve = currentRide->GetRideTypeDescriptor().StartTrackPiece | RideConstructionSpecialPieceSelected; @@ -1335,7 +1335,7 @@ static Widget _rideConstructionWidgets[] = { } else { - uint8_t* brakesSpeedPtr = &_currentBrakeSpeed2; + uint8_t* brakesSpeedPtr = &_currentBrakeSpeed; uint8_t brakesSpeed = *brakesSpeedPtr + 2; if (brakesSpeed <= kMaximumBrakeSpeed) { @@ -1361,7 +1361,7 @@ static Widget _rideConstructionWidgets[] = { } else { - uint8_t* brakesSpeedPtr = &_currentBrakeSpeed2; + uint8_t* brakesSpeedPtr = &_currentBrakeSpeed; uint8_t brakesSpeed = *brakesSpeedPtr - 2; if (brakesSpeed >= 2) { @@ -1449,7 +1449,7 @@ static Widget _rideConstructionWidgets[] = { break; case TrackElemType::BlockBrakes: case TrackElemType::DiagBlockBrakes: - _currentBrakeSpeed2 = kRCT2DefaultBlockBrakeSpeed; + _currentBrakeSpeed = kRCT2DefaultBlockBrakeSpeed; } _currentTrackCurve = trackPiece | RideConstructionSpecialPieceSelected; WindowRideConstructionUpdateActiveElements(); @@ -1507,7 +1507,7 @@ static Widget _rideConstructionWidgets[] = { if (_currentlyShowingBrakeOrBoosterSpeed) { - uint16_t brakeSpeed2 = ((_currentBrakeSpeed2 * 9) >> 2) & 0xFFFF; + uint16_t brakeSpeed2 = ((_currentBrakeSpeed * 9) >> 2) & 0xFFFF; if (TrackTypeIsBooster(_selectedTrackType) || TrackTypeIsBooster(_currentTrackCurve & ~RideConstructionSpecialPieceSelected)) { @@ -3050,7 +3050,7 @@ static Widget _rideConstructionWidgets[] = { { _selectedTrackType = tileElement->AsTrack()->GetTrackType(); if (TrackTypeHasSpeedSetting(tileElement->AsTrack()->GetTrackType())) - _currentBrakeSpeed2 = tileElement->AsTrack()->GetBrakeBoosterSpeed(); + _currentBrakeSpeed = tileElement->AsTrack()->GetBrakeBoosterSpeed(); _currentSeatRotationAngle = tileElement->AsTrack()->GetSeatRotation(); } } diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 135a39355a..3103bd5992 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -74,7 +74,7 @@ TrackPitch _previousTrackPitchEnd; CoordsXYZ _previousTrackPiece; -uint8_t _currentBrakeSpeed2; +uint8_t _currentBrakeSpeed; uint8_t _currentSeatRotationAngle; CoordsXYZD _unkF440C5; diff --git a/src/openrct2/ride/RideConstruction.h b/src/openrct2/ride/RideConstruction.h index a4679faa5a..fbfead2504 100644 --- a/src/openrct2/ride/RideConstruction.h +++ b/src/openrct2/ride/RideConstruction.h @@ -62,7 +62,7 @@ extern TrackPitch _previousTrackPitchEnd; extern CoordsXYZ _previousTrackPiece; -extern uint8_t _currentBrakeSpeed2; +extern uint8_t _currentBrakeSpeed; extern uint8_t _currentSeatRotationAngle; extern CoordsXYZD _unkF440C5; diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp index c749fb40e0..57c78cd18d 100644 --- a/src/openrct2/windows/_legacy.cpp +++ b/src/openrct2/windows/_legacy.cpp @@ -372,7 +372,7 @@ bool WindowRideConstructionUpdateState( if (TrackTypeHasSpeedSetting(trackType)) { - properties = _currentBrakeSpeed2; + properties = _currentBrakeSpeed; } else {