X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mem.c;h=c620d23664392e2f530a2922f0b4545b1984ed21;hb=2d72ce3837ec27364107a13c42ac21a31775621e;hp=4e9f5cb53b5080b2451379ecfd4ed6c1699cebe5;hpb=7badb035c3f8d63022c72c82f54473b59158a0a7;p=xonotic%2Fdarkplaces.git diff --git a/snd_mem.c b/snd_mem.c index 4e9f5cb5..c620d236 100644 --- a/snd_mem.c +++ b/snd_mem.c @@ -242,7 +242,6 @@ sfxcache_t *S_LoadWavFile (const char *filename, sfx_t *s) len = (int) ((double) info.samples * (double) shm->speed / (double) info.rate); len = len * info.width * info.channels; - // FIXME: add S_UnloadSounds or something? Mem_FreePool(&s->mempool); s->mempool = Mem_AllocPool(s->name); sc = s->sfxcache = Mem_Alloc(s->mempool, len + sizeof(sfxcache_t)); @@ -285,8 +284,6 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain) 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; @@ -307,6 +304,10 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain) return sc; // Can't load the sound! + if (!complain) + s->flags |= SFXFLAG_SILENTLYMISSING; + else + s->flags &= ~SFXFLAG_SILENTLYMISSING; if (complain) { if (modified_name)