memsize = newsampleframes * in_format->channels * in_format->width;
memsize += sizeof (*sb) - sizeof (sb->samples);
memsize = newsampleframes * in_format->channels * in_format->width;
memsize += sizeof (*sb) - sizeof (sb->samples);
sb->format.channels = in_format->channels;
sb->format.width = in_format->width;
sb->format.speed = sb_speed;
sb->format.channels = in_format->channels;
sb->format.width = in_format->width;
sb->format.speed = sb_speed;
sb->nbframes = 0;
if (!Snd_AppendToSndBuffer (sb, samples, sampleframes, in_format))
sb->nbframes = 0;
if (!Snd_AppendToSndBuffer (sb, samples, sampleframes, in_format))
+ if (developer_loading.integer)
+ Con_Printf("loading sound %s\n", sfx->name);
+
+ SCR_PushLoadingScreen(true, sfx->name, 1);
+
// LordHavoc: if the sound filename does not begin with sound/, try adding it
if (strncasecmp(sfx->name, "sound/", 6))
{
// LordHavoc: if the sound filename does not begin with sound/, try adding it
if (strncasecmp(sfx->name, "sound/", 6))
{
- len = dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", sfx->name);
- if (len < 0)
- {
- // name too long
- Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", sfx->name);
- return false;
- }
+ dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", sfx->name);
+ len = strlen(namebuffer);
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
{
if (S_LoadWavFile (namebuffer, sfx))
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
{
if (S_LoadWavFile (namebuffer, sfx))
memcpy (namebuffer + len - 3, "ogg", 4);
}
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
{
if (OGG_LoadVorbisFile (namebuffer, sfx))
memcpy (namebuffer + len - 3, "ogg", 4);
}
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
{
if (OGG_LoadVorbisFile (namebuffer, sfx))
- len = dpsnprintf (namebuffer, sizeof(namebuffer), "%s", sfx->name);
- if (len < 0)
- {
- // name too long
- Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", sfx->name);
- return false;
- }
+ dpsnprintf (namebuffer, sizeof(namebuffer), "%s", sfx->name);
+ len = strlen(namebuffer);
// request foo.wav: tries foo.wav, then foo.ogg
// request foo.ogg: tries foo.ogg only
// request foo.mod: tries foo.mod only
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
{
if (S_LoadWavFile (namebuffer, sfx))
// request foo.wav: tries foo.wav, then foo.ogg
// request foo.ogg: tries foo.ogg only
// request foo.mod: tries foo.mod only
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
{
if (S_LoadWavFile (namebuffer, sfx))
memcpy (namebuffer + len - 3, "ogg", 4);
}
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
{
if (OGG_LoadVorbisFile (namebuffer, sfx))
memcpy (namebuffer + len - 3, "ogg", 4);
}
if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
{
if (OGG_LoadVorbisFile (namebuffer, sfx))