From 2c37616a88f1ab966c3de89512843bd7fab8216a Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Tue, 11 Mar 2014 16:44:50 -0500 Subject: Don't mix sfx with NULL soundData Caused a crash. Already done for looping sounds. --- src/client/snd_mix.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/snd_mix.c b/src/client/snd_mix.c index 3c2fd240..faa0044c 100644 --- a/src/client/snd_mix.c +++ b/src/client/snd_mix.c @@ -712,6 +712,10 @@ void S_PaintChannels( int endtime ) { ltime = s_paintedtime; sc = ch->thesfx; + if (sc->soundData==NULL || sc->soundLength==0) { + continue; + } + sampleOffset = ltime - ch->startSample; count = end - ltime; if ( sampleOffset + count > sc->soundLength ) { -- cgit