X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=48dc4990c181fa914a2afa41101cd31846468f81;hb=81d669d017e7e58c358335859c1ec357255a62af;hp=d9d753d7c5ad20f4ca22fa0365b3c5f2c5d71e9e;hpb=a845e9f59600c6443cfca0517d9c30ee9f0904b9;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index d9d753d7..48dc4990 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
 
@@ -103,18 +105,17 @@ void CDAudio_Play (qbyte track, qboolean looping)
 	track = remap[track];
 	if (track < 1)
 	{
-		Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+		Con_Printf("CDAudio: Bad track number %u.\n", track);
 		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)
 	{
@@ -124,7 +125,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
 			if (looping)
 				S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
 			S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
-			Con_DPrintf ("Fake CD track %u playing...\n", track);
+			Con_Printf ("Fake CD track %u playing...\n", track);
 		}
 	}
 
@@ -381,22 +382,22 @@ int CDAudio_Startup (void)
 
 	if (CDAudio_GetAudioDiskInfo())
 	{
-		Con_DPrint("CDAudio_Init: No CD in player.\n");
+		Con_Print("CDAudio_Init: No CD in player.\n");
 		cdValid = false;
 	}
 
 	saved_vol = CDAudio_SysGetVolume ();
 	if (saved_vol < 0.0f)
 	{
-		Con_DPrint ("Can't get initial CD volume\n");
+		Con_Print ("Can't get initial CD volume\n");
 		saved_vol = 1.0f;
 	}
 	else
-		Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
+		Con_Printf ("Initial CD volume: %g\n", saved_vol);
 
 	initialized = true;
 
-	Con_DPrint("CD Audio Initialized\n");
+	Con_Print("CD Audio Initialized\n");
 
 	return 0;
 }