remove the only use of FS_Eof

[xonotic/darkplaces.git] / snd_ogg.c

diff --git a/snd_ogg.c b/snd_ogg.c
index 17fc7dff64105615a3ec4f65c20a6940d866d5a1..74a2e193f708082f2b11762c34117946db69cafb 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -23,6 +23,7 @@
 
 
 #include "quakedef.h"
+#include "snd_main.h"
 #include "snd_ogg.h"
 #include "snd_wav.h"
 
@@ -298,6 +299,10 @@ qboolean OGG_OpenLibrary (void)
        if (vf_dll)
                return true;
 
+// COMMANDLINEOPTION: Sound: -novorbis disables ogg vorbis sound support
+       if (COM_CheckParm("-novorbis"))
+               return false;
+
 #ifdef WIN32
        dllname = "vorbisfile.dll";
 #else
@@ -515,7 +520,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *s)
                return false;
 
        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);
@@ -583,7 +588,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *s)
                long ret;
                sfxbuffer_t *sb;
 
-               Con_DPrintf ("\"%s\" will be streamed\n", filename);
+               Con_DPrintf ("\"%s\" will be cached\n", filename);
 
                // Decode it
                buff = Mem_Alloc (s->mempool, (int)len);