changed brush model API - now uses function pointers for some of the brush model...

[xonotic/darkplaces.git] / snd_dma.c

diff --git a/snd_dma.c b/snd_dma.c
index 0e91d01085ea880e64c443fef90e0f35c872fc60..3470723f68c01a3f62a598598cec638fe4ba400d 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -73,7 +73,7 @@ cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
 
 cvar_t nosound = {0, "nosound", "0"};
-cvar_t precache = {0, "precache", "1"};
+cvar_t snd_precache = {0, "snd_precache", "1"};
 cvar_t bgmbuffer = {0, "bgmbuffer", "4096"};
 cvar_t ambient_level = {0, "ambient_level", "0.3"};
 cvar_t ambient_fade = {0, "ambient_fade", "100"};
@@ -186,7 +186,7 @@ void S_Init (void)
        Cmd_AddCommand("soundinfo", S_SoundInfo_f);
 
        Cvar_RegisterVariable(&nosound);
-       Cvar_RegisterVariable(&precache);
+       Cvar_RegisterVariable(&snd_precache);
        Cvar_RegisterVariable(&bgmbuffer);
        Cvar_RegisterVariable(&ambient_level);
        Cvar_RegisterVariable(&ambient_fade);
@@ -285,6 +285,7 @@ sfx_t *S_FindName (char *name)
                Sys_Error ("S_FindName: out of sfx_t");
 
        sfx = &known_sfx[i];
+       memset(sfx, 0, sizeof(*sfx));
        strcpy (sfx->name, name);
 
        num_sfx++;
@@ -302,7 +303,7 @@ S_TouchSound
 void S_TouchSound (char *name)
 {
        sfx_t   *sfx;
-       
+
        if (!sound_started)
                return;
 
@@ -325,7 +326,7 @@ sfx_t *S_PrecacheSound (char *name, int complain)
        sfx = S_FindName (name);
 
 // cache it in
-       if (precache.integer)
+       if (snd_precache.integer)
                S_LoadSound (sfx, complain);
 
        return sfx;
@@ -676,13 +677,15 @@ void S_UpdateAmbientSounds (void)
        if (!snd_ambient || !cl.worldmodel || ambient_level.value <= 0)
                return;
 
-       l = Mod_PointInLeaf (listener_origin, cl.worldmodel);
+       l = cl.worldmodel->PointInLeaf(cl.worldmodel, listener_origin);
        if (!l)
                return;
 
 // calc ambient sound levels
        for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
        {
+               if (ambient_sfx[ambient_channel] && ambient_sfx[ambient_channel]->silentlymissing)
+                       continue;
                chan = &channels[ambient_channel];
                chan->sfx = ambient_sfx[ambient_channel];
 
@@ -866,7 +869,7 @@ void S_Update_(void)
 // mix ahead of current position
        endtime = soundtime + _snd_mixahead.value * shm->speed;
        samps = shm->samples >> (shm->channels-1);
-       if (endtime - soundtime > samps)
+       if (endtime > (unsigned int)(soundtime + samps))
                endtime = soundtime + samps;
 
 #ifdef _WIN32
@@ -1083,7 +1086,7 @@ void S_RawSamples_Dequeue(int *samples, unsigned int length)
                        out[i] = in[i];
                //Con_Printf("S_RawSamples_Dequeue: normal      %i\n", l);
        }
-       if (l < length)
+       if (l < (int)length)
        {
                memset(samples + l * 2, 0, (length - l) * sizeof(int[2]));
                //Con_Printf("S_RawSamples_Dequeue: padding with %i samples\n", length - l);