From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 26 Oct 2004 07:41:31 +0000 (+0000)
Subject: fixed 3 digit cdtracks loading (it was improperly checking the returned sfx, which... 
X-Git-Tag: xonotic-v0.1.0preview~5418
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ddf8c8b61ac029f670db1f8ec553af04dee99731;p=xonotic%2Fdarkplaces.git

fixed 3 digit cdtracks loading (it was improperly checking the returned sfx, which is never NULL)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4711 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cd_shared.c b/cd_shared.c
index d9d753d7..57554026 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // rights reserved.
 
 #include "quakedef.h"
+#include "snd_main.h"
 
 #define MAXTRACKS	256
 
@@ -107,14 +108,14 @@ void CDAudio_Play (qbyte track, qboolean looping)
 		return;
 	}
 
-	if (cdPlaying && cdPlayTrack == track)
+	if (cdPlaying && cdPlayTrack == track && faketrack == -1)
 		return;
 	CDAudio_Stop ();
 
 	// Try playing a fake track (sound file) first
 	sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
 	// FIXME: perhaps force it to be always %03u (but for compatibility?):
-	if (!sfx)
+	if (sfx == NULL || sfx->fetcher == NULL)
 		sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
 	if (sfx != NULL)
 	{