removed all 3 uses of the brown-text message prefix in the server

[xonotic/darkplaces.git] / snd_wav.c

diff --git a/snd_wav.c b/snd_wav.c
index 59b2d49b52c492360d021feac5e82f6167439d0e..89bd6c6e4cd9f5ba45406507929aa235c883345d 100644 (file)
--- a/snd_wav.c
+++ b/snd_wav.c
@@ -38,10 +38,10 @@ typedef struct wavinfo_s
 } wavinfo_t;
 
 
-static qbyte *data_p;
-static qbyte *iff_end;
-static qbyte *last_chunk;
-static qbyte *iff_data;
+static unsigned char *data_p;
+static unsigned char *iff_end;
+static unsigned char *last_chunk;
+static unsigned char *iff_data;
 static int iff_chunk_len;
 
 
@@ -122,7 +122,7 @@ static void DumpChunks(void)
 GetWavinfo
 ============
 */
-static wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
+static wavinfo_t GetWavinfo (char *name, unsigned char *wav, int wavlength)
 {
        wavinfo_t info;
        int i;
@@ -205,7 +205,7 @@ static wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
        {
                if (samples < info.samples)
                {
-                       Con_Printf ("Sound %s has a bad loop length", name);
+                       Con_Printf ("Sound %s has a bad loop length\n", name);
                        info.samples = samples;
                }
        }
@@ -255,7 +255,8 @@ S_LoadWavFile
 */
 qboolean S_LoadWavFile (const char *filename, sfx_t *s)
 {
-       qbyte *data;
+       fs_offset_t filesize;
+       unsigned char *data;
        wavinfo_t info;
        int len;
        size_t memsize;
@@ -266,7 +267,7 @@ qboolean S_LoadWavFile (const char *filename, sfx_t *s)
                return true;
 
        // Load the file
-       data = FS_LoadFile(filename, snd_mempool, false);
+       data = FS_LoadFile(filename, snd_mempool, false, &filesize);
        if (!data)
                return false;
 
@@ -279,7 +280,7 @@ qboolean S_LoadWavFile (const char *filename, sfx_t *s)
 
        Con_DPrintf ("Loading WAV file \"%s\"\n", filename);
 
-       info = GetWavinfo (s->name, data, (int)fs_filesize);
+       info = GetWavinfo (s->name, data, (int)filesize);
        // Stereo sounds are allowed (intended for music)
        if (info.channels < 1 || info.channels > 2)
        {
@@ -312,7 +313,7 @@ qboolean S_LoadWavFile (const char *filename, sfx_t *s)
        if (info.loopstart < 0)
                s->loopstart = -1;
        else
-               s->loopstart = (double)info.loopstart * (double)shm->format.speed / (double)s->format.speed;
+               s->loopstart = (int)((double)info.loopstart * (double)shm->format.speed / (double)s->format.speed);
        s->flags &= ~SFXFLAG_STREAMED;
 
 #if BYTE_ORDER != LITTLE_ENDIAN