Configure all of the CL_MeshEntities* meshes the same, the material flags decide...

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index c8cdd6c38465303aab9c655e0cead2f532bf32f5..bc07b849f9febd274d719cdf36a2d3e7ca7699a5 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -112,7 +112,7 @@ void CDAudio_SysSetVolume (float volume)
 }
 
 
-int CDAudio_SysPlay (unsigned char track)
+int CDAudio_SysPlay (int track)
 {
        struct cdrom_tocentry entry;
        struct cdrom_ti ti;
@@ -203,7 +203,7 @@ int CDAudio_SysUpdate (void)
        struct cdrom_subchnl subchnl;
        static time_t lastchk = 0;
 
-       if (cdPlaying && lastchk < time(NULL))
+       if (cdPlaying && lastchk < time(NULL) && cdfile != -1)
        {
                lastchk = time(NULL) + 2; //two seconds between chks
                subchnl.cdsc_format = CDROM_MSF;