From b40ea0169df9dd32070023490121971d5a6b2772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Wed, 4 Nov 2020 02:43:26 +0100 Subject: [PATCH] Rename sub_6B5952 to ChainQueues (#13357) Also remove unreachable call to it --- src/openrct2/ride/Ride.cpp | 16 +++++----------- src/openrct2/ride/Ride.h | 1 + 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 5eeaba051f..682bf1ef75 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -3893,14 +3893,14 @@ static int32_t ride_check_for_entrance_exit(ride_id_t rideIndex) } /** - * + * Calls footpath_chain_ride_queue for all entrances of the ride * rct2: 0x006B5952 */ -static void sub_6B5952(Ride* ride) +void Ride::ChainQueues() const { for (int32_t i = 0; i < MAX_STATIONS; i++) { - auto location = ride_get_entrance_location(ride, i); + auto location = ride_get_entrance_location(this, i); if (location.isNull()) continue; @@ -3919,7 +3919,7 @@ static void sub_6B5952(Ride* ride) continue; int32_t direction = tileElement->GetDirection(); - footpath_chain_ride_queue(ride->id, i, mapLocation, tileElement, direction_reverse(direction)); + footpath_chain_ride_queue(id, i, mapLocation, tileElement, direction_reverse(direction)); } while (!(tileElement++)->IsLastForTile()); } } @@ -5139,12 +5139,6 @@ bool Ride::Test(int32_t newStatus, bool isApplying) return false; } - if (newStatus == RIDE_STATUS_OPEN && isApplying) - { - sub_6B5952(this); - lifecycle_flags |= RIDE_LIFECYCLE_EVER_BEEN_OPENED; - } - // z = ride->stations[i].GetBaseZ(); auto startLoc = stations[stationIndex].Start; trackElement.x = startLoc.x; @@ -5274,7 +5268,7 @@ bool Ride::Open(int32_t goingToBeOpen, bool isApplying) if (goingToBeOpen && isApplying) { - sub_6B5952(this); + ChainQueues(); lifecycle_flags |= RIDE_LIFECYCLE_EVER_BEEN_OPENED; } diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index dc30ddb93e..62e809c073 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -377,6 +377,7 @@ private: void UpdateSpiralSlide(); void UpdateQueueLength(StationIndex stationIndex); money32 CalculateIncomePerHour() const; + void ChainQueues() const; void ConstructMissingEntranceOrExit() const; public: