X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=9cedbac1e8fae162c40914d567fbb47502f9ca3a;hb=946a7c133e92aa10b091e124a32c6a2e0738af99;hp=c0f0514c48cb9fa314af94dd33e5e2a2aa34142f;hpb=7c320ed3cd5e1738024b3cd3f1fc305940f88dce;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index c0f0514c..9cedbac1 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,15 +109,15 @@ 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, true, false);
+	sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
 	// FIXME: perhaps force it to be always %03u (but for compatibility?):
-	if (!sfx)
-		sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, true, false);
+	if (sfx == NULL || sfx->fetcher == NULL)
+		sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
 	if (sfx != NULL)
 	{
 		faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);