From 704895f9b9629f3249ca1542ee0143e379117a4d Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Wed, 4 Nov 2009 02:37:05 +0000 Subject: [PATCH] - Fixed: S_RestartSound() cleared the evicted flag even if the sound was not restarted because it was too close to too many other identical sounds that were already playing. SVN r1962 (trunk) --- docs/rh-log.txt | 3 +++ src/s_sound.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index fdb2dcbd1..b400d677e 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,7 @@ November 3, 2009 +- Fixed: S_RestartSound() cleared the evicted flag even if the sound + was not restarted because it was too close to too many other identical + sounds that were already playing. - Added virtual status and audibility to the noise debug display. - Added a command line option -warpwipe to perform the screen wipe if you start with -warp or +map. diff --git a/src/s_sound.cpp b/src/s_sound.cpp index ffacab9e6..1287873a5 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -250,7 +250,7 @@ void S_NoiseDebug (void) screen->DrawText(SmallFont, color, 380, y, temp, TAG_DONE); // Audibility - mysnprintf(temp, countof(temp), "%.2g", GSnd->GetAudibility(chan)); + mysnprintf(temp, countof(temp), "%.4f", GSnd->GetAudibility(chan)); screen->DrawText(SmallFont, color, 460, y, temp, TAG_DONE); y += 8; @@ -1125,7 +1125,6 @@ void S_RestartSound(FSoundChan *chan) if (chan->ChanFlags & (CHAN_UI|CHAN_NOPAUSE)) startflags |= SNDF_NOPAUSE; if (chan->ChanFlags & CHAN_ABSTIME) startflags |= SNDF_ABSTIME; - chan->ChanFlags &= ~(CHAN_EVICTED|CHAN_ABSTIME); if (chan->ChanFlags & CHAN_IS3D) { FVector3 pos, vel; @@ -1142,11 +1141,13 @@ void S_RestartSound(FSoundChan *chan) SoundListener listener; S_SetListener(listener, players[consoleplayer].camera); + chan->ChanFlags &= ~(CHAN_EVICTED|CHAN_ABSTIME); ochan = (FSoundChan*)GSnd->StartSound3D(sfx->data, &listener, chan->Volume, &chan->Rolloff, chan->DistanceScale, chan->Pitch, chan->Priority, pos, vel, chan->EntChannel, startflags, chan); } else { + chan->ChanFlags &= ~(CHAN_EVICTED|CHAN_ABSTIME); ochan = (FSoundChan*)GSnd->StartSound(sfx->data, chan->Volume, chan->Pitch, startflags, chan); } assert(ochan == NULL || ochan == chan);