no longer complains about missing sounds loaded by the engine (wind2, water1, etc...

[xonotic/darkplaces.git] / snd_dma.c

diff --git a/snd_dma.c b/snd_dma.c
index e68e96691045524dd6d9ffe2f710c2a44f7f88b9..37881b507a6c7c6602479890d64a4f04b85be8c7 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -66,13 +66,11 @@ sfx_t               *ambient_sfx[NUM_AMBIENTS];
 
 int sound_started = 0;
 
-// FIXME: make bgmvolume/volume always be registered for sake of config saving, and add check for whether sound is enabled to menu
 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 loadas8bit = {0, "loadas8bit", "0"};
 cvar_t bgmbuffer = {0, "bgmbuffer", "4096"};
 cvar_t ambient_level = {0, "ambient_level", "0.3"};
 cvar_t ambient_fade = {0, "ambient_fade", "100"};
@@ -170,6 +168,9 @@ void S_Init (void)
 {
        Con_Printf("\nSound Initialization\n");
 
+       Cvar_RegisterVariable(&volume);
+       Cvar_RegisterVariable(&bgmvolume);
+
        if (COM_CheckParm("-nosound"))
                return;
 
@@ -186,10 +187,7 @@ void S_Init (void)
        Cmd_AddCommand("soundinfo", S_SoundInfo_f);
 
        Cvar_RegisterVariable(&nosound);
-       Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&precache);
-//     Cvar_RegisterVariable(&loadas8bit);
-       Cvar_RegisterVariable(&bgmvolume);
        Cvar_RegisterVariable(&bgmbuffer);
        Cvar_RegisterVariable(&ambient_level);
        Cvar_RegisterVariable(&ambient_fade);
@@ -198,16 +196,6 @@ void S_Init (void)
        Cvar_RegisterVariable(&_snd_mixahead);
        Cvar_RegisterVariable(&snd_swapstereo); // LordHavoc: for people with backwards sound wiring
 
-       /*
-       if (host_parms.memsize < 0x800000)
-       {
-               Cvar_Set ("loadas8bit", "1");
-               Con_Printf ("loading all sounds as 8bit\n");
-       }
-       */
-
-
-
        snd_initialized = true;
 
        known_sfx = Mem_Alloc(snd_mempool, MAX_SFX*sizeof(sfx_t));
@@ -241,11 +229,8 @@ void S_Init (void)
 
        // provides a tick sound until washed clean
 
-//     if (shm->buffer)
-//             shm->buffer[4] = shm->buffer[5] = 0x7f; // force a pop for debugging
-
-       ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav");
-       ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav");
+       ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav", false);
+       ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav", false);
 
        S_StopAllSounds (true);
 }
@@ -283,8 +268,8 @@ S_FindName
 */
 sfx_t *S_FindName (char *name)
 {
-       int             i;
-       sfx_t   *sfx;
+       int i;
+       sfx_t *sfx;
 
        if (!name)
                Host_Error ("S_FindName: NULL\n");
@@ -293,20 +278,18 @@ sfx_t *S_FindName (char *name)
                Host_Error ("Sound name too long: %s", name);
 
 // see if already loaded
-       for (i=0 ; i < num_sfx ; i++)
+       for (i = 0;i < num_sfx;i++)
                if (!strcmp(known_sfx[i].name, name))
-               {
                        return &known_sfx[i];
-               }
 
        if (num_sfx == MAX_SFX)
                Sys_Error ("S_FindName: out of sfx_t");
-       
+
        sfx = &known_sfx[i];
        strcpy (sfx->name, name);
 
        num_sfx++;
-       
+
        return sfx;
 }
 
@@ -333,9 +316,9 @@ S_PrecacheSound
 
 ==================
 */
-sfx_t *S_PrecacheSound (char *name)
+sfx_t *S_PrecacheSound (char *name, int complain)
 {
-       sfx_t   *sfx;
+       sfx_t *sfx;
 
        if (!sound_started || nosound.integer)
                return NULL;
@@ -344,7 +327,7 @@ sfx_t *S_PrecacheSound (char *name)
 
 // cache it in
        if (precache.integer)
-               S_LoadSound (sfx);
+               S_LoadSound (sfx, complain);
 
        return sfx;
 }
@@ -492,7 +475,7 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
                return;         // not audible at all
 
 // new channel
-       sc = S_LoadSound (sfx);
+       sc = S_LoadSound (sfx, true);
        if (!sc)
        {
                target_chan->sfx = NULL;
@@ -653,7 +636,7 @@ void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
        ss = &channels[total_channels];
        total_channels++;
 
-       sc = S_LoadSound (sfx);
+       sc = S_LoadSound (sfx, true);
        if (!sc)
                return;
 
@@ -798,8 +781,6 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
                                continue;
                        }
                }
-
-
        }
 
 //
@@ -811,10 +792,7 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
                ch = channels;
                for (i=0 ; i<total_channels; i++, ch++)
                        if (ch->sfx && (ch->leftvol || ch->rightvol) )
-                       {
-                               //Con_Printf ("%3i %3i %s\n", ch->leftvol, ch->rightvol, ch->sfx->name);
                                total++;
-                       }
 
                Con_Printf ("----(%i)----\n", total);
        }
@@ -884,10 +862,7 @@ void S_Update_(void)
 
 // check to make sure that we haven't overshot
        if (paintedtime < soundtime)
-       {
-               //Con_Printf ("S_Update_ : overflow\n");
                paintedtime = soundtime;
-       }
 
 // mix ahead of current position
        endtime = soundtime + _snd_mixahead.value * shm->speed;
@@ -944,7 +919,7 @@ void S_Play(void)
                }
                else
                        strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
+               sfx = S_PrecacheSound(name, true);
                S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
                i++;
        }
@@ -967,7 +942,7 @@ void S_Play2(void)
                }
                else
                        strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
+               sfx = S_PrecacheSound(name, true);
                S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 0.0);
                i++;
        }
@@ -991,7 +966,7 @@ void S_PlayVol(void)
                }
                else
                        strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
+               sfx = S_PrecacheSound(name, true);
                vol = atof(Cmd_Argv(i+1));
                S_StartSound(hash++, 0, sfx, listener_origin, vol, 1.0);
                i+=2;
@@ -1032,7 +1007,7 @@ void S_LocalSound (char *sound)
        if (!sound_started)
                return;
 
-       sfx = S_PrecacheSound (sound);
+       sfx = S_PrecacheSound (sound, true);
        if (!sfx)
        {
                Con_Printf ("S_LocalSound: can't precache %s\n", sound);