mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Revert "Fix #18048: Play music from all ride's stations (#24722)" (#25097)

Browse Source 
This reverts commit 5a8150a941.
This commit is contained in:
Michał Janiszewski
2025-09-03 11:54:16 +02:00
committed by GitHub
parent 1669a627d7
commit 77012410a9
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

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

22
src/openrct2/ride/Ride.cpp
View File

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