don't try to send entities with a NAN origin (this is strangely crashing the PVS...

[xonotic/darkplaces.git] / snd_ogg.c

diff --git a/snd_ogg.c b/snd_ogg.c
index cdc41f759a62b1dd078a000c39a65844b0fea872..a342f4a809d4285bac8435647b671521d6301971 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -296,7 +296,9 @@ qboolean OGG_OpenLibrary (void)
 {
        const char* dllnames_vo [] =
        {
-#ifdef WIN32
+#if defined(WIN64)
+               "vorbis64.dll",
+#elif defined(WIN32)
                "vorbis.dll",
 #elif defined(MACOSX)
                "libvorbis.dylib",
@@ -308,7 +310,9 @@ qboolean OGG_OpenLibrary (void)
        };
        const char* dllnames_vf [] =
        {
-#ifdef WIN32
+#if defined(WIN64)
+               "vorbisfile64.dll",
+#elif defined(WIN32)
                "vorbisfile.dll",
 #elif defined(MACOSX)
                "libvorbisfile.dylib",
@@ -452,7 +456,7 @@ static const sfxbuffer_t* OGG_FetchSound (channel_t* ch, unsigned int start, uns
        if (sb->offset <= start && sb->offset + sb->length >= start + nbsamples)
                return sb;
 
-       newlength = sb->offset + sb->length - start;
+       newlength = (int)(sb->offset + sb->length) - start;
 
        // If we need to skip some data before decompressing the rest, or if the stream has looped
        if (newlength < 0 || sb->offset > start)