Fix names of two track type functions

This commit is contained in:
Gymnasiast 2020-08-10 23:48:18 +02:00
parent 6802011f7d
commit 89f04c4fb3
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
11 changed files with 17 additions and 17 deletions

View File

@ -2513,7 +2513,7 @@ void window_ride_construction_update_active_elements_impl()
!= std::nullopt) != std::nullopt)
{ {
_selectedTrackType = tileElement->AsTrack()->GetTrackType(); _selectedTrackType = tileElement->AsTrack()->GetTrackType();
if (track_element_has_speed_setting(tileElement->AsTrack()->GetTrackType())) if (TrackTypeHasSpeedSetting(tileElement->AsTrack()->GetTrackType()))
_currentBrakeSpeed2 = tileElement->AsTrack()->GetBrakeBoosterSpeed(); _currentBrakeSpeed2 = tileElement->AsTrack()->GetBrakeBoosterSpeed();
_currentSeatRotationAngle = tileElement->AsTrack()->GetSeatRotation(); _currentSeatRotationAngle = tileElement->AsTrack()->GetSeatRotation();
} }
@ -3065,7 +3065,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
bool brakesSelected = _selectedTrackType == TRACK_ELEM_BRAKES bool brakesSelected = _selectedTrackType == TRACK_ELEM_BRAKES
|| _currentTrackCurve == (RideConstructionSpecialPieceSelected | TRACK_ELEM_BRAKES); || _currentTrackCurve == (RideConstructionSpecialPieceSelected | TRACK_ELEM_BRAKES);
_boosterTrackSelected = track_element_is_booster(ride->type, _selectedTrackType) _boosterTrackSelected = TrackTypeIsBooster(ride->type, _selectedTrackType)
|| (ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE || (ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE
&& _currentTrackCurve == (RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER)); && _currentTrackCurve == (RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER));

View File

@ -633,7 +633,7 @@ public:
map_animation_create(MAP_ANIMATION_TYPE_TRACK_SPINNINGTUNNEL, CoordsXYZ{ mapLoc, tileElement->GetBaseZ() }); map_animation_create(MAP_ANIMATION_TYPE_TRACK_SPINNINGTUNNEL, CoordsXYZ{ mapLoc, tileElement->GetBaseZ() });
break; break;
} }
if (track_element_has_speed_setting(_trackType)) if (TrackTypeHasSpeedSetting(_trackType))
{ {
tileElement->AsTrack()->SetBrakeBoosterSpeed(_brakeSpeed); tileElement->AsTrack()->SetBrakeBoosterSpeed(_brakeSpeed);
} }

View File

@ -2132,7 +2132,7 @@ private:
// Skipping IsHighlighted() // Skipping IsHighlighted()
auto trackType = dst2->GetTrackType(); auto trackType = dst2->GetTrackType();
if (track_element_has_speed_setting(trackType)) if (TrackTypeHasSpeedSetting(trackType))
{ {
dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed()); dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed());
} }

View File

@ -245,7 +245,7 @@ bool RCT12TrackElement::IsInverted() const
uint8_t RCT12TrackElement::GetBrakeBoosterSpeed() const uint8_t RCT12TrackElement::GetBrakeBoosterSpeed() const
{ {
if (track_element_has_speed_setting(GetTrackType())) if (TrackTypeHasSpeedSetting(GetTrackType()))
{ {
return (sequence >> 4) << 1; return (sequence >> 4) << 1;
} }
@ -791,7 +791,7 @@ void RCT12TrackElement::SetInverted(bool inverted)
void RCT12TrackElement::SetBrakeBoosterSpeed(uint8_t speed) void RCT12TrackElement::SetBrakeBoosterSpeed(uint8_t speed)
{ {
if (track_element_has_speed_setting(GetTrackType())) if (TrackTypeHasSpeedSetting(GetTrackType()))
{ {
sequence &= ~0b11110000; sequence &= ~0b11110000;
sequence |= ((speed >> 1) << 4); sequence |= ((speed >> 1) << 4);

View File

@ -1130,7 +1130,7 @@ public:
// Skipping IsHighlighted() // Skipping IsHighlighted()
auto trackType = dst2->GetTrackType(); auto trackType = dst2->GetTrackType();
if (track_element_has_speed_setting(trackType)) if (TrackTypeHasSpeedSetting(trackType))
{ {
dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed()); dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed());
} }

View File

@ -1470,7 +1470,7 @@ void ride_construction_set_default_next_piece()
} }
else else
{ {
if (track_element_is_booster(ride->type, trackType)) if (TrackTypeIsBooster(ride->type, trackType))
{ {
curve = RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER; curve = RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER;
} }
@ -1531,7 +1531,7 @@ void ride_construction_set_default_next_piece()
} }
else else
{ {
if (track_element_is_booster(ride->type, trackType)) if (TrackTypeIsBooster(ride->type, trackType))
{ {
curve = RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER; curve = RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER;
} }

View File

@ -1195,13 +1195,13 @@ bool track_element_is_covered(track_type_t trackElementType)
} }
} }
bool track_element_is_booster(uint8_t rideType, track_type_t trackType) bool TrackTypeIsBooster(uint8_t rideType, track_type_t trackType)
{ {
// Boosters share their ID with the Spinning Control track. // Boosters share their ID with the Spinning Control track.
return rideType != RIDE_TYPE_SPINNING_WILD_MOUSE && trackType == TRACK_ELEM_BOOSTER; return rideType != RIDE_TYPE_SPINNING_WILD_MOUSE && trackType == TRACK_ELEM_BOOSTER;
} }
bool track_element_has_speed_setting(track_type_t trackType) bool TrackTypeHasSpeedSetting(track_type_t trackType)
{ {
// This does not check if the element is really a Spinning Control track instead of a booster, // This does not check if the element is really a Spinning Control track instead of a booster,
// but this does not cause problems. // but this does not cause problems.

View File

@ -585,5 +585,5 @@ money32 maze_set_track(
uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, ride_id_t rideIndex, uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, ride_id_t rideIndex,
uint8_t mode); uint8_t mode);
bool track_element_is_booster(uint8_t rideType, track_type_t trackType); bool TrackTypeIsBooster(uint8_t rideType, track_type_t trackType);
bool track_element_has_speed_setting(track_type_t trackType); bool TrackTypeHasSpeedSetting(track_type_t trackType);

View File

@ -217,7 +217,7 @@ rct_string_id TrackDesign::CreateTrackDesignTrack(const Ride& ride)
} }
uint8_t trackFlags; uint8_t trackFlags;
if (track_element_has_speed_setting(track.type)) if (TrackTypeHasSpeedSetting(track.type))
{ {
trackFlags = trackElement.element->AsTrack()->GetBrakeBoosterSpeed() >> 1; trackFlags = trackElement.element->AsTrack()->GetBrakeBoosterSpeed() >> 1;
} }

View File

@ -8130,7 +8130,7 @@ loc_6DAEB9:
} }
} }
} }
else if (track_element_is_booster(curRide->type, trackType)) else if (TrackTypeIsBooster(curRide->type, trackType))
{ {
regs.eax = get_booster_speed(curRide->type, (brake_speed << 16)); regs.eax = get_booster_speed(curRide->type, (brake_speed << 16));
@ -8513,7 +8513,7 @@ loc_6DBA33:;
} }
} }
if (track_element_is_booster(curRide->type, trackType)) if (TrackTypeIsBooster(curRide->type, trackType))
{ {
regs.eax = get_booster_speed(curRide->type, (brake_speed << 16)); regs.eax = get_booster_speed(curRide->type, (brake_speed << 16));

View File

@ -364,7 +364,7 @@ bool window_ride_construction_update_state(
} }
} }
if (track_element_has_speed_setting(trackType)) if (TrackTypeHasSpeedSetting(trackType))
{ {
properties = _currentBrakeSpeed2; properties = _currentBrakeSpeed2;
} }