diff --git a/src/audio/audio.c b/src/audio/audio.c index 803ffd5fcb..e16613cf7e 100644 --- a/src/audio/audio.c +++ b/src/audio/audio.c @@ -23,6 +23,7 @@ #include "../interface/viewport.h" #include "../interface/window.h" #include "../platform/platform.h" +#include "../ride/ride.h" #include "../world/map.h" #include "../world/sprite.h" #include "audio.h" diff --git a/src/audio/audio.h b/src/audio/audio.h index d7205407a6..aee7f80f00 100644 --- a/src/audio/audio.h +++ b/src/audio/audio.h @@ -147,7 +147,8 @@ typedef struct { uint8 var_9; } rct_ride_music_info; -extern rct_ride_music_info* ride_music_info_list[46]; +#define NUM_DEFAULT_MUSIC_TRACKS 46 +extern rct_ride_music_info* ride_music_info_list[NUM_DEFAULT_MUSIC_TRACKS]; extern rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS]; extern rct_vehicle_sound_params gVehicleSoundParamsList[AUDIO_MAX_VEHICLE_SOUNDS]; extern rct_vehicle_sound_params *gVehicleSoundParamsListEnd; diff --git a/src/ride/ride.c b/src/ride/ride.c index 8f11aad916..2cd47c25a6 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -3313,7 +3313,7 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint #define INIT_MUSIC_INFO(pathid, offset, length, unknown) (rct_ride_music_info[]){length, offset, pathid, unknown} //0x009AF1C8 -rct_ride_music_info* ride_music_info_list[46] = { +rct_ride_music_info* ride_music_info_list[NUM_DEFAULT_MUSIC_TRACKS] = { INIT_MUSIC_INFO(PATH_ID_CSS4, 1378, 8139054, 0), INIT_MUSIC_INFO(PATH_ID_CSS5, 1378, 7796656, 0), INIT_MUSIC_INFO(PATH_ID_CSS6, 1378, 15787850, 0),