mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #7703: Prevent sounds being produced by inactive industries (#7752)

pull/7771/head
abmyii 2019-10-12 09:16:16 +01:00 committed by Niels Martin Hansen
parent e2e112baaa
commit ac21118736
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/industry_cmd.cpp
View File

@ -1124,11 +1124,16 @@ static void ProduceIndustryGoods(Industry *i)
/* play a sound? */ /* play a sound? */
if ((i->counter & 0x3F) == 0) { if ((i->counter & 0x3F) == 0) {
uint32 r; uint32 r;
uint num; if (Chance16R(1, 14, r) && indsp->number_of_sounds != 0 && _settings_client.sound.ambient) {
if (Chance16R(1, 14, r) && (num = indsp->number_of_sounds) != 0 && _settings_client.sound.ambient) { for (size_t j = 0; j < lengthof(i->last_month_production); j++) {
if (i->last_month_production[j] > 0) {
/* Play sound since last month had production */
SndPlayTileFx( SndPlayTileFx(
(SoundFx)(indsp->random_sounds[((r >> 16) * num) >> 16]), (SoundFx)(indsp->random_sounds[((r >> 16) * indsp->number_of_sounds) >> 16]),
i->location.tile); i->location.tile);
break;
}
}
} }
} }