added VectorLerp

[xonotic/darkplaces.git] / snd_dma.c

diff --git a/snd_dma.c b/snd_dma.c
index aa6a755f1c1bbf331458f36800fd9d44673b92b2..6de33897f78545c8aa9e768ec390b9a7c4d2903b 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -689,11 +689,7 @@ void S_UpdateAmbientSounds (void)
        for (ambient_channel = 0 ; ambient_channel < NUM_AMBIENTS;ambient_channel++)
                channels[ambient_channel].sfx = NULL;
 
-       if (!snd_ambient || !cl.worldmodel || ambient_level.value <= 0)
-               return;
-
-       l = cl.worldmodel->PointInLeaf(cl.worldmodel, listener_origin);
-       if (!l)
+       if (!snd_ambient || ambient_level.value <= 0 || !cl.worldmodel || !cl.worldmodel->brushq1.PointInLeaf || (l = cl.worldmodel->brushq1.PointInLeaf(cl.worldmodel, listener_origin)) == NULL)
                return;
 
 // calc ambient sound levels
@@ -702,6 +698,7 @@ void S_UpdateAmbientSounds (void)
                if (ambient_sfx[ambient_channel] && ambient_sfx[ambient_channel]->silentlymissing)
                        continue;
                chan = &channels[ambient_channel];
+               chan->forceloop = true;
                chan->sfx = ambient_sfx[ambient_channel];
 
                vol = ambient_level.value * l->ambient_sound_level[ambient_channel];