X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=70a446caff2d9dacb80b890c4c7d7a9a68d945de;hb=9c0b9e9bf48754ac5984a5eb5682fc869bb98277;hp=d9d753d7c5ad20f4ca22fa0365b3c5f2c5d71e9e;hpb=a845e9f59600c6443cfca0517d9c30ee9f0904b9;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index d9d753d7..70a446ca 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // rights reserved.
 
 #include "quakedef.h"
+#include "cdaudio.h"
+#include "snd_main.h"
 
 #define MAXTRACKS	256
 
@@ -107,14 +109,13 @@ 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)
 	{