zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 00:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed rules for picking rolloff info to be the same as for the NearLimit.

Browse source 
SVN r1207 (trunk)
This commit is contained in:
Christoph Oelckers 2008-09-09 09:31:41 +00:00
parent 3b35ad2db2
commit 5ad25e5d07
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/s_sound.cpp
View file

@ -857,7 +857,6 @@ static FSoundChan *S_StartSound(AActor *actor, const sector_t *sec, const FPolyO
}
sfx = &S_sfx[sound_id];
rolloff = sfx->Rolloff.MinDistance == 0? &S_Rolloff : &sfx->Rolloff;
// Scale volume according to SNDINFO data.
volume = MIN(volume * sfx->Volume, 1.f);
@ -867,6 +866,7 @@ static FSoundChan *S_StartSound(AActor *actor, const sector_t *sec, const FPolyO
// When resolving a link we do not want to get the NearLimit of
// the referenced sound so some additional checks are required
int near_limit = sfx->NearLimit;
rolloff = &sfx->Rolloff;
// Resolve player sounds, random sounds, and aliases
while (sfx->link != sfxinfo_t::NO_LINK)
@ -875,20 +875,26 @@ static FSoundChan *S_StartSound(AActor *actor, const sector_t *sec, const FPolyO
{
sound_id = FSoundID(S_FindSkinnedSound (actor, sound_id));
near_limit = S_sfx[sound_id].NearLimit;
rolloff = &S_sfx[sound_id].Rolloff;
}
else if (sfx->bRandomHeader)
{
sound_id = FSoundID(S_PickReplacement (sound_id));
if (near_limit < 0) near_limit = S_sfx[sound_id].NearLimit;
if (rolloff->MinDistance == 0) rolloff = &S_sfx[sound_id].Rolloff;
}
else
{
sound_id = FSoundID(sfx->link);
if (near_limit < 0) near_limit = S_sfx[sound_id].NearLimit;
if (rolloff->MinDistance == 0) rolloff = &S_sfx[sound_id].Rolloff;
}
sfx = &S_sfx[sound_id];
}
// If no valid rolloff was set use the global default
if (rolloff->MinDistance == 0) rolloff = &S_Rolloff;
// If this is a singular sound, don't play it if it's already playing.
if (sfx->bSingular && S_CheckSingular(sound_id))
{