fixed lightgrid out-of-bounds crash (for example when one hits the very top of a...

[xonotic/darkplaces.git] / snd_mem.c

diff --git a/snd_mem.c b/snd_mem.c
index 4e2a94ec26d91c0511d6da07e4739387bd5efcfb..3eab525707b7eb2065df721d0212edc1e2855f7a 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-qbyte *S_Alloc (int size);
-
 /*
 ================
 ResampleSfx
@@ -38,6 +36,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
        srclength = sc->length << sc->stereo;
 
        outcount = (double) sc->length * (double) shm->speed / (double) sc->speed;
+       Con_DPrintf("ResampleSfx: resampling sound %s from %dhz to %dhz (%d samples to %d samples)\n", name, sc->speed, shm->speed, sc->length, outcount);
        sc->length = outcount;
        if (sc->loopstart != -1)
                sc->loopstart = (double) sc->loopstart * (double) shm->speed / (double) sc->speed;
@@ -48,6 +47,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 
        if (fracstep == 256)
        {
+               // fast case for direct transfer
                if (sc->width == 1) // 8bit
                        for (i = 0;i < srclength;i++)
                                ((signed char *)sc->data)[i] = ((unsigned char *)data)[i] - 128;
@@ -57,8 +57,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
        }
        else
        {
-// general case
-               Con_DPrintf("ResampleSfx: resampling sound %s\n", name);
+               // general case
                samplefrac = 0;
                if ((fracstep & 255) == 0) // skipping points on perfect multiple
                {
@@ -201,7 +200,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
        }
 
        // LordHavoc: use this for testing if it ever becomes useful again
-//     COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width);
+       //COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width);
 }
 
 //=============================================================================
@@ -211,35 +210,37 @@ 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;
-       wavinfo_t       info;
-       int             len;
-       sfxcache_t      *sc;
+       char namebuffer[MAX_QPATH];
+       qbyte *data;
+       wavinfo_t info;
+       int len;
+       sfxcache_t *sc;
 
-// see if still in memory
+       // see if still in memory
        if (s->sfxcache)
                return s->sfxcache;
 
-// load it in
+       // load it in
        strcpy(namebuffer, "sound/");
        strcat(namebuffer, s->name);
 
-       data = COM_LoadFile(namebuffer, false);
+       data = FS_LoadFile(namebuffer, false);
 
        if (!data)
        {
-               Con_Printf ("Couldn't load %s\n", namebuffer);
+               s->silentlymissing = !complain;
+               if (complain)
+                       Con_Printf("Couldn't load %s\n", namebuffer);
                return NULL;
        }
 
-       info = GetWavinfo (s->name, data, com_filesize);
+       info = GetWavinfo (s->name, data, fs_filesize);
        // LordHavoc: stereo sounds are now allowed (intended for music)
        if (info.channels < 1 || info.channels > 2)
        {
-               Con_Printf ("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
+               Con_Printf("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
                Mem_Free(data);
                return NULL;
        }
@@ -254,6 +255,7 @@ sfxcache_t *S_LoadSound (sfx_t *s)
        sc = s->sfxcache = Mem_Alloc(s->mempool, len + sizeof(sfxcache_t));
        if (!sc)
        {
+               Con_Printf("failed to allocate memory for sound \"%s\"\n", s->name);
                Mem_FreePool(&s->mempool);
                Mem_Free(data);
                return NULL;
@@ -265,7 +267,7 @@ sfxcache_t *S_LoadSound (sfx_t *s)
        sc->width = info.width;
        sc->stereo = info.channels == 2;
 
-       ResampleSfx (sc, data + info.dataofs, s->name);
+       ResampleSfx(sc, data + info.dataofs, s->name);
 
        Mem_Free(data);
        return sc;
@@ -282,11 +284,11 @@ WAV loading
 */
 
 
-qbyte  *data_p;
-qbyte  *iff_end;
-qbyte  *last_chunk;
-qbyte  *iff_data;
-int    iff_chunk_len;
+qbyte *data_p;
+qbyte *iff_end;
+qbyte *last_chunk;
+qbyte *iff_data;
+int iff_chunk_len;
 
 
 short GetLittleShort(void)
@@ -344,8 +346,8 @@ void FindChunk(char *name)
 
 void DumpChunks(void)
 {
-       char    str[5];
-       
+       char str[5];
+
        str[4] = 0;
        data_p=iff_data;
        do
@@ -365,10 +367,10 @@ GetWavinfo
 */
 wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
 {
-       wavinfo_t       info;
-       int     i;
-       int     format;
-       int             samples;
+       wavinfo_t info;
+       int i;
+       int format;
+       int samples;
 
        memset (&info, 0, sizeof(info));
 
@@ -378,7 +380,7 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
        iff_data = wav;
        iff_end = wav + wavlength;
 
-// find "RIFF" chunk
+       // find "RIFF" chunk
        FindChunk("RIFF");
        if (!(data_p && !strncmp(data_p+8, "WAVE", 4)))
        {
@@ -386,9 +388,9 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
                return info;
        }
 
-// get "fmt " chunk
+       // get "fmt " chunk
        iff_data = data_p + 12;
-// DumpChunks ();
+       //DumpChunks ();
 
        FindChunk("fmt ");
        if (!data_p)
@@ -409,14 +411,14 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
        data_p += 4+2;
        info.width = GetLittleShort() / 8;
 
-// get cue chunk
+       // get cue chunk
        FindChunk("cue ");
        if (data_p)
        {
                data_p += 32;
                info.loopstart = GetLittleLong();
 
-       // if the next chunk is a LIST chunk, look for a cue length marker
+               // if the next chunk is a LIST chunk, look for a cue length marker
                FindNextChunk ("LIST");
                if (data_p)
                {
@@ -431,7 +433,7 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
        else
                info.loopstart = -1;
 
-// find data chunk
+       // find data chunk
        FindChunk("data");
        if (!data_p)
        {