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 61085b6e8f55d2a0623e503da0dd02cd1a66ebd9..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",
@@ -492,7 +496,7 @@ static const sfxbuffer_t* OGG_FetchSound (channel_t* ch, unsigned int start, uns
                done += ret;
 
        // Resample in the sfxbuffer
-       newlength = ResampleSfx (resampling_buffer, (size_t)done / (size_t)factor, &per_sfx->format, sb->data + sb->length * factor, sfx->name);
+       newlength = (int)ResampleSfx (resampling_buffer, (size_t)done / (size_t)factor, &per_sfx->format, sb->data + sb->length * (size_t)factor, sfx->name);
        sb->length += newlength;
 
        return sb;
@@ -579,7 +583,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *s)
 
        // Decide if we go for a stream or a simple PCM cache
        buff_len = ceil (STREAM_BUFFER_DURATION * (shm->format.speed * 2 * vi->channels));
-       if (snd_streaming.integer && len > fs_filesize + 3 * buff_len)
+       if (snd_streaming.integer && len > (ogg_int64_t)fs_filesize + 3 * buff_len)
        {
                ogg_stream_persfx_t* per_sfx;
 
@@ -636,7 +640,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *s)
                s->loopstart = -1;
                s->flags &= ~SFXFLAG_STREAMED;
 
-               sb->length = ResampleSfx (buff, (size_t)done / (vi->channels * 2), &s->format, sb->data, s->name);
+               sb->length = (unsigned int)ResampleSfx (buff, (size_t)done / (vi->channels * 2), &s->format, sb->data, s->name);
                s->format.speed = shm->format.speed;
                s->total_length = sb->length;
                sb->offset = 0;