From 1e1dd2fc2fe1760847f19696c86e8a9907c65aba Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 21 Aug 2019 14:26:13 +0200 Subject: [PATCH] Increase the number of ride music played simultaneously to 32 --- src/openrct2/audio/Audio.cpp | 2 +- src/openrct2/audio/audio.h | 4 ++-- src/openrct2/ride/Ride.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 142bd1ab2a..2122a3b262 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -49,7 +49,7 @@ void* gTitleMusicChannel = nullptr; void* gRainSoundChannel = nullptr; rct_ride_music gRideMusicList[AUDIO_MAX_RIDE_MUSIC]; -rct_ride_music_params gRideMusicParamsList[6]; +rct_ride_music_params gRideMusicParamsList[AUDIO_MAX_RIDE_MUSIC]; rct_ride_music_params* gRideMusicParamsListEnd; rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS]; diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/audio.h index 9fe1d14c47..0645292d24 100644 --- a/src/openrct2/audio/audio.h +++ b/src/openrct2/audio/audio.h @@ -13,7 +13,7 @@ #include "../ride/RideTypes.h" #define AUDIO_DEVICE_NAME_SIZE 256 -#define AUDIO_MAX_RIDE_MUSIC 2 +#define AUDIO_MAX_RIDE_MUSIC 32 #define AUDIO_MAX_VEHICLE_SOUNDS 14 #define NUM_DEFAULT_MUSIC_TRACKS 46 #define AUDIO_PLAY_AT_CENTRE 0x8000 @@ -164,7 +164,7 @@ extern void* gRainSoundChannel; extern rct_ride_music gRideMusicList[AUDIO_MAX_RIDE_MUSIC]; extern rct_ride_music_info gRideMusicInfoList[NUM_DEFAULT_MUSIC_TRACKS]; -extern rct_ride_music_params gRideMusicParamsList[6]; +extern rct_ride_music_params gRideMusicParamsList[AUDIO_MAX_RIDE_MUSIC]; extern rct_ride_music_params* gRideMusicParamsListEnd; extern rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS]; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 206ea629f6..6b1675f9f2 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -3705,7 +3705,7 @@ void ride_music_update_final() rct_ride_music_params* ride_music_params = &gRideMusicParamsList[0]; while (ride_music_params < gRideMusicParamsListEnd) { - if (ride_music_params->ride_id != (uint8_t)-1) + if (ride_music_params->ride_id != RIDE_ID_NULL) { v8++; if (v9 >= ride_music_params->volume) @@ -3716,7 +3716,7 @@ void ride_music_update_final() } ride_music_params++; } - if (v8 <= 2) + if (v8 <= AUDIO_MAX_RIDE_MUSIC) { break; }