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

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1969 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_parse.c b/cl_parse.c
index ef85680cfaccdfed4d598f712b8c6797041e868a..fcc03231cfaa3da4e94804e485e97fdfe4255a35 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -459,7 +459,7 @@ void CL_ParseServerInfo (void)
        S_BeginPrecaching ();
        for (i=1 ; i<numsounds ; i++)
        {
-               cl.sound_precache[i] = S_PrecacheSound (sound_precache[i]);
+               cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
                CL_KeepaliveMessage ();
        }
        S_EndPrecaching ();

diff --git a/cl_tent.c b/cl_tent.c
index 52cca6dda308971fa0f5b814f3f4ea36480265d4..c5606a4323fc082df927b261936774cff457e619 100644 (file)
--- a/cl_tent.c
+++ b/cl_tent.c
@@ -45,13 +45,13 @@ CL_ParseTEnt
 */
 void CL_InitTEnts (void)
 {
-       cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav");
-       cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav");
-       cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav");
-       cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav");
-       cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav");
-       cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav");
-       cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav");
+       cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav", false);
+       cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav", false);
+       cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav", false);
+       cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav", false);
+       cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav", false);
+       cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav", false);
+       cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false);
 }
 
 /*

diff --git a/snd_dma.c b/snd_dma.c
index 85e7f132f322f60468e0686127cd9532ec5d3168..37881b507a6c7c6602479890d64a4f04b85be8c7 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -229,8 +229,8 @@ void S_Init (void)
 
        // provides a tick sound until washed clean
 
-       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);
 }
@@ -268,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");
@@ -278,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;
 }
 
@@ -318,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;
@@ -329,7 +327,7 @@ sfx_t *S_PrecacheSound (char *name)
 
 // cache it in
        if (precache.integer)
-               S_LoadSound (sfx);
+               S_LoadSound (sfx, complain);
 
        return sfx;
 }
@@ -477,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;
@@ -638,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;
 
@@ -921,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++;
        }
@@ -944,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++;
        }
@@ -968,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;
@@ -1009,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);

diff --git a/snd_mem.c b/snd_mem.c
index 4e2a94ec26d91c0511d6da07e4739387bd5efcfb..9c355a12db7409fc32abd53a603962b3921ce63c 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -211,7 +211,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 S_LoadSound
 ==============
 */
-sfxcache_t *S_LoadSound (sfx_t *s)
+sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 {
     char       namebuffer[256];
        qbyte   *data;
@@ -231,7 +231,8 @@ sfxcache_t *S_LoadSound (sfx_t *s)
 
        if (!data)
        {
-               Con_Printf ("Couldn't load %s\n", namebuffer);
+               if (complain)
+                       Con_Printf ("Couldn't load %s\n", namebuffer);
                return NULL;
        }
 

diff --git a/snd_mix.c b/snd_mix.c
index a31b4ce5075dcea5992a7a486de83c31764f7dab..d388a36f153c8b236ae23a186cffbd0fe1985b25 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -353,7 +353,7 @@ void S_PaintChannels(int endtime)
                                continue;
                        if (!ch->leftvol && !ch->rightvol)
                                continue;
-                       sc = S_LoadSound (ch->sfx);
+                       sc = S_LoadSound (ch->sfx, true);
                        if (!sc)
                                continue;
 

diff --git a/sound.h b/sound.h
index a37b2e8d0958dc7007624be0d94e9b343971ba37..ebc0a849ccea6219d1c40fd7e9fdbf4d3e49853f 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -98,7 +98,7 @@ void S_ClearBuffer (void);
 void S_Update (vec3_t origin, vec3_t v_forward, vec3_t v_right, vec3_t v_up);
 void S_ExtraUpdate (void);
 
-sfx_t *S_PrecacheSound (char *sample);
+sfx_t *S_PrecacheSound (char *sample, int complain);
 void S_TouchSound (char *sample);
 void S_ClearPrecache (void);
 void S_BeginPrecaching (void);
@@ -167,7 +167,7 @@ extern qboolean     snd_initialized;
 extern int snd_blocked;
 
 void S_LocalSound (char *s);
-sfxcache_t *S_LoadSound (sfx_t *s);
+sfxcache_t *S_LoadSound (sfx_t *s, int complain);
 
 wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength);