diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 4712ebb318..ee37f369e2 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -15,7 +15,6 @@ - Change: [#25024] Guests in mazes no longer jump during heavy snow or blizzards, as they would when it rains. - Fix: [#12831] Zooming to cursor on land edges sometimes causes the camera to move to the wrong position. - Fix: [#16988] AppImage version does not show changelog. -- Fix: [#18048] Play music from all ride's stations. - Fix: [#19137] Non-inverted left corkscrew supports are incorrect at one angle (original bug). - Fix: [#23440] Quarter loops do not block metal supports correctly (original bug). - Fix: [#24001] Sloped diagonal metal supports that are offset with a crossbeam draw incorrectly. diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 49c97c9ef7..75d8231296 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -1919,16 +1919,11 @@ void CircusMusicUpdate(Ride& ride) return; } + CoordsXYZ rideCoords = ride.getStation().GetStart().ToTileCentre(); + const auto sampleRate = RideMusicSampleRate(ride); - for (const auto& station : ride.getStations()) - { - if (!station.Start.IsNull()) - { - CoordsXYZ rideCoords = station.GetStart().ToTileCentre(); - OpenRCT2::RideAudio::UpdateMusicInstance(ride, rideCoords, sampleRate); - } - } + OpenRCT2::RideAudio::UpdateMusicInstance(ride, rideCoords, sampleRate); } /** @@ -1962,16 +1957,11 @@ void DefaultMusicUpdate(Ride& ride) return; } + CoordsXYZ rideCoords = ride.getStation().GetStart().ToTileCentre(); + int32_t sampleRate = RideMusicSampleRate(ride); - for (const auto& station : ride.getStations()) - { - if (!station.Start.IsNull()) - { - CoordsXYZ rideCoords = station.GetStart().ToTileCentre(); - OpenRCT2::RideAudio::UpdateMusicInstance(ride, rideCoords, sampleRate); - } - } + OpenRCT2::RideAudio::UpdateMusicInstance(ride, rideCoords, sampleRate); } static void RideMusicUpdate(Ride& ride)