mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Rename _currentBrakeSpeed2 to _currentBrakeSpeed

Browse Source
This commit is contained in:
Gymnasiast
2024-04-20 15:14:36 +02:00
committed by Michael Steenbeek
parent 22e7ad598b
commit 00618c79d2
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/windows/RideConstruction.cpp
View File

@@ -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();
}
}

2
src/openrct2/ride/RideConstruction.cpp
View File

@@ -74,7 +74,7 @@ TrackPitch _previousTrackPitchEnd;
CoordsXYZ _previousTrackPiece;
uint8_t _currentBrakeSpeed2;
uint8_t _currentBrakeSpeed;
uint8_t _currentSeatRotationAngle;
CoordsXYZD _unkF440C5;

2
src/openrct2/ride/RideConstruction.h
View File

@@ -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;

2
src/openrct2/windows/_legacy.cpp
View File

@@ -372,7 +372,7 @@ bool WindowRideConstructionUpdateState(
if (TrackTypeHasSpeedSetting(trackType))
{
properties = _currentBrakeSpeed2;
properties = _currentBrakeSpeed;
}
else
{