Made Q1 face loading faster by using a faster lightmap packing algorithm.

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 319e6fac5a737570dae587e3c29b4408ad82fecc..03596e78bd5cbcf17b41ddf23c718a3d6fee2d9b 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -143,9 +143,9 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
                                S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
                        S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
                        if(track >= 1)
-                               Con_Printf ("Fake CD track %u playing...\n", track);
+                               Con_DPrintf ("Fake CD track %u playing...\n", track);
                        else
-                               Con_Printf ("BGM track %s playing...\n", trackname);
+                               Con_DPrintf ("BGM track %s playing...\n", trackname);
                }
        }
 
@@ -407,7 +407,7 @@ int CDAudio_Init (void)
                return -1;
 
 // COMMANDLINEOPTION: Sound: -nocdaudio disables CD audio support
-       if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe"))
+       if (COM_CheckParm("-nocdaudio"))
                return -1;
 
        CDAudio_SysInit();
@@ -426,6 +426,9 @@ int CDAudio_Init (void)
 
 int CDAudio_Startup (void)
 {
+       if (COM_CheckParm("-nocdaudio"))
+               return -1;
+
        CDAudio_SysStartup ();
 
        if (CDAudio_GetAudioDiskInfo())