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

Fix #3307, ride music discrepancy with original (#3319)

This commit is contained in:
Yaroslav Tretyakov 2016-04-16 07:09:22 -06:00 committed by Ted John
parent ea19684d94
commit 90a4cafc87
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/audio.c
View File

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

2
src/audio/audio.h
View File

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

2
src/ride/ride.c
View File

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