Added gl_picmip slider and r_restart button to Graphics menu ("Texture Quality" and...

[xonotic/darkplaces.git] / snd_wav.c

diff --git a/snd_wav.c b/snd_wav.c
index e11c24563f5684ea674d2b19768a66b33f374dd8..ff4bb4069f3c56845ef279e8cdf3358a8433006b 100644 (file)
--- a/snd_wav.c
+++ b/snd_wav.c
@@ -23,6 +23,7 @@
 
 
 #include "quakedef.h"
+#include "snd_main.h"
 #include "snd_wav.h"
 
 
@@ -241,7 +242,7 @@ qboolean S_LoadWavFile (const char *filename, sfx_t *s)
        sfxbuffer_t* sb;
 
        Mem_FreePool (&s->mempool);
-       s->mempool = Mem_AllocPool(s->name);
+       s->mempool = Mem_AllocPool(s->name, 0, NULL);
 
        // Load the file
        data = FS_LoadFile(filename, s->mempool, false);
@@ -268,6 +269,8 @@ qboolean S_LoadWavFile (const char *filename, sfx_t *s)
                Mem_FreePool (&s->mempool);
                return false;
        }
+       //if (info.channels == 2)
+       //      Log_Printf("stereosounds.log", "%s\n", s->name);
 
        // calculate resampled length
        len = (int) ((double) info.samples * (double) shm->format.speed / (double) info.rate);
@@ -290,6 +293,7 @@ qboolean S_LoadWavFile (const char *filename, sfx_t *s)
                s->loopstart = -1;
        else
                s->loopstart = (double)info.loopstart * (double)shm->format.speed / (double)s->format.speed;
+       s->flags &= ~SFXFLAG_STREAMED;
 
 #if BYTE_ORDER != LITTLE_ENDIAN
        // We must convert the WAV data from little endian