reimplemented rtlight portal culling (used for compiled rtlights, and can be used...

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index c0f0514c48cb9fa314af94dd33e5e2a2aa34142f..48dc4990c181fa914a2afa41101cd31846468f81 100644 (file)
--- 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,19 +105,18 @@ 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, true, 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);
+       sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, 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);
@@ -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;
 }