This is a patch from Elric greatly cleaning up the filesystem portions of the engine...

[xonotic/darkplaces.git] / snd_mem.c

diff --git a/snd_mem.c b/snd_mem.c
index c8c0bdaa25a810d170b13a13f5fb8f7479618a35..47398c6e0bde95f92279ed238d5c60dd82543410 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -228,7 +228,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
        strcpy(namebuffer, "sound/");
        strcat(namebuffer, s->name);
 
-       data = COM_LoadFile(namebuffer, false);
+       data = FS_LoadFile(namebuffer, false);
 
        if (!data)
        {
@@ -237,7 +237,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
                return NULL;
        }
 
-       info = GetWavinfo (s->name, data, com_filesize);
+       info = GetWavinfo (s->name, data, fs_filesize);
        // LordHavoc: stereo sounds are now allowed (intended for music)
        if (info.channels < 1 || info.channels > 2)
        {