*/
-#include "quakedef.h"
+#include "darkplaces.h"
#include "snd_main.h"
#include "snd_ogg.h"
#include "snd_wav.h"
+#ifdef USEXMP
+#include "snd_xmp.h"
+#endif
+#include "sound.h"
+void SCR_PushLoadingScreen (const char *, float);
+void SCR_PopLoadingScreen (qbool);
/*
====================
S_LoadSound
==============
*/
-qboolean S_LoadSound (sfx_t *sfx, qboolean complain)
+qbool S_LoadSound (sfx_t *sfx, qbool complain)
{
char namebuffer[MAX_QPATH + 16];
size_t len;
if (developer_loading.integer)
Con_Printf("loading sound %s\n", sfx->name);
- SCR_PushLoadingScreen(true, sfx->name, 1);
+ SCR_PushLoadingScreen(sfx->name, 1);
- // LordHavoc: if the sound filename does not begin with sound/, try adding it
+ // LadyHavoc: if the sound filename does not begin with sound/, try adding it
if (strncasecmp(sfx->name, "sound/", 6))
{
dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", sfx->name);
if (OGG_LoadVorbisFile (namebuffer, sfx))
goto loaded;
}
+#ifdef USEXMP
+ else if (len >= 1)
+ {
+ if (XMP_LoadModFile (namebuffer, sfx))
+ goto loaded;
+ }
+#endif
}
- // LordHavoc: then try without the added sound/ as wav and ogg
+ // LadyHavoc: then try without the added sound/ as wav and ogg
dpsnprintf (namebuffer, sizeof(namebuffer), "%s", sfx->name);
len = strlen(namebuffer);
// request foo.wav: tries foo.wav, then foo.ogg
if (OGG_LoadVorbisFile (namebuffer, sfx))
goto loaded;
}
+#ifdef USEXMP
+ else if (len >= 1)
+ {
+ if (XMP_LoadModFile (namebuffer, sfx))
+ goto loaded;
+ }
+#endif
// Can't load the sound!
sfx->flags |= SFXFLAG_FILEMISSING;
if (complain)
- Con_DPrintf("failed to load sound \"%s\"\n", sfx->name);
+ Con_Printf(CON_ERROR "Failed to load sound \"%s\"\n", sfx->name);
SCR_PopLoadingScreen(false);
return false;