Fixed a MSVC6 warning in matrixlib. Added a "Public server" yes/no line in the server...

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index d188b8e13fb3bf4a1d491572d693c860b06e7fb0..eb8ef45f0abf11570930783c31625b0f78feaf12 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -211,9 +211,9 @@ void CDAudio_Resume(void)
 
 static void CD_f (void)
 {
-       char    *command;
-       int             ret;
-       int             n;
+       const char      *command;
+       int                     ret;
+       int                     n;
 
        if (Cmd_Argc() < 2)
                return;
@@ -375,7 +375,7 @@ int CDAudio_Init(void)
        if (cls.state == ca_dedicated)
                return -1;
 
-       if (COM_CheckParm("-nocdaudio"))
+       if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe"))
                return -1;
 
        if ((i = COM_CheckParm("-cddev")) != 0 && i < com_argc - 1) {
@@ -417,3 +417,11 @@ void CDAudio_Shutdown(void)
        close(cdfile);
        cdfile = -1;
 }
+
+void CDAudio_Open(void)
+{
+}
+
+void CDAudio_Close(void)
+{
+}