significant surface renderer optimizations

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 9bca5e5b150d5519e775f667062d3cf4d3c2109e..89dcbdbf633b8ce55d8cbb671d43613d916c83cd 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "cdaudio.h"
-#include "snd_main.h"
+#include "sound.h"
 
 #define MAXTRACKS      256
 
@@ -60,6 +60,7 @@ qboolean cdPlaying = false;
 qboolean cdPlayLooping = false;
 unsigned char cdPlayTrack;
 
+cl_cdstate_t cd;
 
 static void CDAudio_Eject (void)
 {
@@ -117,7 +118,7 @@ void CDAudio_Play (unsigned char track, qboolean looping)
 
        // Try playing a fake track (sound file) first
        sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
-       if (sfx == NULL || sfx->fetcher == NULL)
+       if (sfx == NULL || !S_IsSoundPrecached (sfx))
                sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
        if (sfx != NULL)
        {