From 89f04c4fb3c520d7b29ad101badc86f8ffbd1f28 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 10 Aug 2020 23:48:18 +0200 Subject: [PATCH] Fix names of two track type functions --- src/openrct2-ui/windows/RideConstruction.cpp | 4 ++-- src/openrct2/actions/TrackPlaceAction.hpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct12/RCT12.cpp | 4 ++-- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 4 ++-- src/openrct2/ride/Track.cpp | 4 ++-- src/openrct2/ride/Track.h | 4 ++-- src/openrct2/ride/TrackDesign.cpp | 2 +- src/openrct2/ride/Vehicle.cpp | 4 ++-- src/openrct2/windows/_legacy.cpp | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 2b56111548..0a4760b798 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2513,7 +2513,7 @@ void window_ride_construction_update_active_elements_impl() != std::nullopt) { _selectedTrackType = tileElement->AsTrack()->GetTrackType(); - if (track_element_has_speed_setting(tileElement->AsTrack()->GetTrackType())) + if (TrackTypeHasSpeedSetting(tileElement->AsTrack()->GetTrackType())) _currentBrakeSpeed2 = tileElement->AsTrack()->GetBrakeBoosterSpeed(); _currentSeatRotationAngle = tileElement->AsTrack()->GetSeatRotation(); } @@ -3065,7 +3065,7 @@ static void window_ride_construction_update_widgets(rct_window* w) bool brakesSelected = _selectedTrackType == 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 && _currentTrackCurve == (RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER)); diff --git a/src/openrct2/actions/TrackPlaceAction.hpp b/src/openrct2/actions/TrackPlaceAction.hpp index a788e40778..439483c6af 100644 --- a/src/openrct2/actions/TrackPlaceAction.hpp +++ b/src/openrct2/actions/TrackPlaceAction.hpp @@ -633,7 +633,7 @@ public: map_animation_create(MAP_ANIMATION_TYPE_TRACK_SPINNINGTUNNEL, CoordsXYZ{ mapLoc, tileElement->GetBaseZ() }); break; } - if (track_element_has_speed_setting(_trackType)) + if (TrackTypeHasSpeedSetting(_trackType)) { tileElement->AsTrack()->SetBrakeBoosterSpeed(_brakeSpeed); } diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index f84cb2f362..089e28f9d0 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2132,7 +2132,7 @@ private: // Skipping IsHighlighted() auto trackType = dst2->GetTrackType(); - if (track_element_has_speed_setting(trackType)) + if (TrackTypeHasSpeedSetting(trackType)) { dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed()); } diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index 703c70c177..616afc052c 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -245,7 +245,7 @@ bool RCT12TrackElement::IsInverted() const uint8_t RCT12TrackElement::GetBrakeBoosterSpeed() const { - if (track_element_has_speed_setting(GetTrackType())) + if (TrackTypeHasSpeedSetting(GetTrackType())) { return (sequence >> 4) << 1; } @@ -791,7 +791,7 @@ void RCT12TrackElement::SetInverted(bool inverted) void RCT12TrackElement::SetBrakeBoosterSpeed(uint8_t speed) { - if (track_element_has_speed_setting(GetTrackType())) + if (TrackTypeHasSpeedSetting(GetTrackType())) { sequence &= ~0b11110000; sequence |= ((speed >> 1) << 4); diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 35f4bc3f3a..1159b198f1 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1130,7 +1130,7 @@ public: // Skipping IsHighlighted() auto trackType = dst2->GetTrackType(); - if (track_element_has_speed_setting(trackType)) + if (TrackTypeHasSpeedSetting(trackType)) { dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed()); } diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index e283256db3..de83e3ccbd 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -1470,7 +1470,7 @@ void ride_construction_set_default_next_piece() } else { - if (track_element_is_booster(ride->type, trackType)) + if (TrackTypeIsBooster(ride->type, trackType)) { curve = RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER; } @@ -1531,7 +1531,7 @@ void ride_construction_set_default_next_piece() } else { - if (track_element_is_booster(ride->type, trackType)) + if (TrackTypeIsBooster(ride->type, trackType)) { curve = RideConstructionSpecialPieceSelected | TRACK_ELEM_BOOSTER; } diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 11e8a6adb3..2e105cc65d 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -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. 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, // but this does not cause problems. diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 2b6cd6bc9a..603e0bd143 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -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, uint8_t mode); -bool track_element_is_booster(uint8_t rideType, track_type_t trackType); -bool track_element_has_speed_setting(track_type_t trackType); +bool TrackTypeIsBooster(uint8_t rideType, track_type_t trackType); +bool TrackTypeHasSpeedSetting(track_type_t trackType); diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 429cfac5fc..6cf69e7e27 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -217,7 +217,7 @@ rct_string_id TrackDesign::CreateTrackDesignTrack(const Ride& ride) } uint8_t trackFlags; - if (track_element_has_speed_setting(track.type)) + if (TrackTypeHasSpeedSetting(track.type)) { trackFlags = trackElement.element->AsTrack()->GetBrakeBoosterSpeed() >> 1; } diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index b2fdc89606..4ecb5100db 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -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)); @@ -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)); diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp index 75df7e5d3f..34f938b6df 100644 --- a/src/openrct2/windows/_legacy.cpp +++ b/src/openrct2/windows/_legacy.cpp @@ -364,7 +364,7 @@ bool window_ride_construction_update_state( } } - if (track_element_has_speed_setting(trackType)) + if (TrackTypeHasSpeedSetting(trackType)) { properties = _currentBrakeSpeed2; }