mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Increase the number of ride music played simultaneously to 32

This commit is contained in:
Matt 2019-08-21 14:26:13 +02:00
parent e19b3f5680
commit 1e1dd2fc2f
No known key found for this signature in database
GPG Key ID: 6D4C24A61C93E208
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/audio/Audio.cpp
View File

@ -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];

4
src/openrct2/audio/audio.h
View File

@ -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];

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

@ -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;
}