redesigned csqc shared entity .Version handling, now internally uses a

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 5eeadaed60d85a9ab3d77b6b896410bf14ece5e2..aa33079dd2ea55710e50481907f3a85cb5918734 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -171,7 +171,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
                        Con_Print("Could not load BGM track.\n");
                        return;
                }
-       
+
                if (!cdValid)
                {
                        CDAudio_GetAudioDiskInfo();
@@ -214,7 +214,7 @@ void CDAudio_Stop (void)
 
        if (faketrack != -1)
        {
-               S_StopChannel (faketrack);
+               S_StopChannel (faketrack, true);
                faketrack = -1;
        }
        else if (cdPlaying && (CDAudio_SysStop() == -1))
@@ -257,13 +257,14 @@ static void CD_f (void)
        int ret;
        int n;
 
-       Host_StartVideo();
-
        if (Cmd_Argc() < 2)
                return;
 
        command = Cmd_Argv (1);
 
+       if (strcasecmp(command, "remap") != 0)
+               Host_StartVideo();
+
        if (strcasecmp(command, "on") == 0)
        {
                enabled = true;