#include "quakedef.h"
+#include "ogg.h"
+
+
/*
================
ResampleSfx
/*
==============
-S_LoadSound
+S_LoadWavFile
==============
*/
-sfxcache_t *S_LoadSound (sfx_t *s, int complain)
+sfxcache_t *S_LoadWavFile (const char *filename, sfx_t *s)
{
- char namebuffer[MAX_QPATH];
qbyte *data;
wavinfo_t info;
int len;
sfxcache_t *sc;
- // see if still in memory
- if (!shm || !shm->speed)
+ // Load the file
+ data = FS_LoadFile(filename, false);
+ if (!data)
return NULL;
- if (s->sfxcache && s->sfxcache->speed == shm->speed)
- return s->sfxcache;
-
- // load it in
- snprintf(namebuffer, sizeof(namebuffer), "sound/%s", s->name);
-
- data = FS_LoadFile(namebuffer, false);
- if (!data)
- {
- s->silentlymissing = !complain;
- if (complain)
- Con_Printf("Couldn't load %s\n", namebuffer);
+ // Don't try to load it if it's not a WAV file
+ if (memcmp (data, "RIFF", 4) || memcmp (data + 8, "WAVE", 4))
return NULL;
- }
info = GetWavinfo (s->name, data, fs_filesize);
- // LordHavoc: stereo sounds are now allowed (intended for music)
+ // Stereo sounds are allowed (intended for music)
if (info.channels < 1 || info.channels > 2)
{
Con_Printf("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
return sc;
}
+
+/*
+==============
+S_LoadSound
+==============
+*/
+sfxcache_t *S_LoadSound (sfx_t *s, int complain)
+{
+ char namebuffer[MAX_QPATH];
+ size_t len;
+ sfxcache_t *sc;
+ qboolean modified_name = false;
+
+ // see if still in memory
+ if (!shm || !shm->speed)
+ return NULL;
+ if (s->sfxcache && (s->sfxcache->speed == shm->speed))
+ return s->sfxcache;
+
+ s->silentlymissing = !complain;
+
+ len = snprintf (namebuffer, sizeof (namebuffer), "sound/%s", s->name);
+ if (len >= sizeof (namebuffer))
+ return NULL;
+
+ // Try to load it as a WAV file
+ sc = S_LoadWavFile (namebuffer, s);
+ if (sc != NULL)
+ return sc;
+
+ // Else, try to load it as an Ogg Vorbis file
+ if (!strcasecmp (namebuffer + len - 4, ".wav"))
+ {
+ strcpy (namebuffer + len - 3, "ogg");
+ modified_name = true;
+ }
+ sc = OGG_LoadVorbisFile (namebuffer, s);
+ if (sc != NULL)
+ return sc;
+
+ // Can't load the sound!
+ if (complain)
+ {
+ if (modified_name)
+ strcpy (namebuffer + len - 3, "wav");
+ Con_Printf ("Couldn't load %s\n", namebuffer);
+ }
+ return NULL;
+}
+
void S_UnloadSound(sfx_t *s)
{
if (s->sfxcache)