remove unused variable

[xonotic/darkplaces.git] / snd_mem.c

diff --git a/snd_mem.c b/snd_mem.c
index 777dd6c6652b3c9769c4d99d1d374ba4601fc98c..adb296ff2ddfdfa74723d54597d9912e9a7c30cc 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -80,7 +80,7 @@ snd_buffer_t *Snd_CreateSndBuffer (const unsigned char *samples, unsigned int sa
 {
        size_t newsampleframes, memsize;
        snd_buffer_t* sb;
-       
+
        newsampleframes = (double)sampleframes * (double)sb_speed / (double)in_format->speed;
 
        memsize = newsampleframes * in_format->channels * in_format->width;
@@ -311,6 +311,7 @@ qboolean S_LoadSound (sfx_t *sfx, qboolean complain)
                return true;
 
        // If we weren't able to load it previously, no need to retry
+       // Note: S_PrecacheSound clears this flag to cause a retry
        if (sfx->flags & SFXFLAG_FILEMISSING)
                return false;
 
@@ -318,6 +319,9 @@ qboolean S_LoadSound (sfx_t *sfx, qboolean complain)
        if (snd_renderbuffer == NULL)
                return false;
 
+       // Initialize volume peak to 0; if ReplayGain is supported, the loader will change this away
+       sfx->volume_peak = 0.0;
+
        // LordHavoc: if the sound filename does not begin with sound/, try adding it
        if (strncasecmp(sfx->name, "sound/", 6))
        {
@@ -325,13 +329,13 @@ qboolean S_LoadSound (sfx_t *sfx, qboolean complain)
                if (len < 0)
                {
                        // name too long
-                       Con_Printf("S_LoadSound: name \"%s\" is too long\n", sfx->name);
+                       Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", sfx->name);
                        return false;
                }
                if (S_LoadWavFile (namebuffer, sfx))
                        return true;
                if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
-                       strcpy (namebuffer + len - 3, "ogg");
+                       memcpy (namebuffer + len - 3, "ogg", 4);
                if (OGG_LoadVorbisFile (namebuffer, sfx))
                        return true;
        }
@@ -341,19 +345,19 @@ qboolean S_LoadSound (sfx_t *sfx, qboolean complain)
        if (len < 0)
        {
                // name too long
-               Con_Printf("S_LoadSound: name \"%s\" is too long\n", sfx->name);
+               Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", sfx->name);
                return false;
        }
        if (S_LoadWavFile (namebuffer, sfx))
                return true;
        if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
-               strcpy (namebuffer + len - 3, "ogg");
+               memcpy (namebuffer + len - 3, "ogg", 4);
        if (OGG_LoadVorbisFile (namebuffer, sfx))
                return true;
 
        // Can't load the sound!
        sfx->flags |= SFXFLAG_FILEMISSING;
        if (complain)
-               Con_Printf("S_LoadSound: Couldn't load \"%s\"\n", sfx->name);
+               Con_DPrintf("S_LoadSound: Couldn't load \"%s\"\n", sfx->name);
        return false;
 }