diff --git a/src/audio/audio.c b/src/audio/audio.c index d98a015b2c..2a813ae657 100644 --- a/src/audio/audio.c +++ b/src/audio/audio.c @@ -44,7 +44,7 @@ void *gCrowdSoundChannel = 0; bool gGameSoundsOff = false; void *gRainSoundChannel = 0; rct_ride_music gRideMusicList[AUDIO_MAX_RIDE_MUSIC]; -rct_ride_music_params gRideMusicParamsList[AUDIO_MAX_RIDE_MUSIC]; +rct_ride_music_params gRideMusicParamsList[6]; rct_ride_music_params *gRideMusicParamsListEnd; void *gTitleMusicChannel = 0; rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS]; diff --git a/src/audio/audio.h b/src/audio/audio.h index fcbbc4d5e9..e2165d8927 100644 --- a/src/audio/audio.h +++ b/src/audio/audio.h @@ -158,7 +158,7 @@ extern bool gGameSoundsOff; 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[AUDIO_MAX_RIDE_MUSIC]; +extern rct_ride_music_params gRideMusicParamsList[6]; extern rct_ride_music_params *gRideMusicParamsListEnd; extern void *gTitleMusicChannel; extern rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS]; diff --git a/src/ride/ride.c b/src/ride/ride.c index cab105fda3..3d07187056 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -3429,7 +3429,7 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint if (a1 < gRideMusicInfoList[*tuneId]->length) { position = a1; rct_ride_music_params* ride_music_params = gRideMusicParamsListEnd; - if (ride_music_params < &gRideMusicParamsList[AUDIO_MAX_RIDE_MUSIC]) { + if (ride_music_params < &gRideMusicParamsList[countof(gRideMusicParamsList)]) { ride_music_params->ride_id = rideIndex; ride_music_params->tune_id = *tuneId; ride_music_params->offset = a1;