diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 5d41364331..66807d0d02 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -2899,7 +2899,8 @@ static void ride_music_update(Ride* ride) return; } - CoordsXYZ rideCoords{ ride->stations[0].Start.x * 32, ride->stations[0].Start.y * 32, ride->stations[0].Height * 8 }; + TileCoordsXYZ rideTileCoords{ ride->stations[0].Start.x, ride->stations[0].Start.y, ride->stations[0].Height }; + CoordsXYZ rideCoords{rideTileCoords.ToCoordsXYZ()}; rideCoords = { rideCoords.ToTileCentre(), rideCoords.z }; int32_t sampleRate = 22050; diff --git a/src/openrct2/world/Location.hpp b/src/openrct2/world/Location.hpp index 4d3aa1e6ba..2f835c933e 100644 --- a/src/openrct2/world/Location.hpp +++ b/src/openrct2/world/Location.hpp @@ -273,6 +273,11 @@ struct TileCoordsXYZ return !(*this == other); } + CoordsXYZ ToCoordsXYZ() + { + return { x * 32, y * 32, z * 8 }; + } + int32_t x = 0, y = 0, z = 0; };