X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=aa33079dd2ea55710e50481907f3a85cb5918734;hb=04ff9e9b94566e25ebea87e4251eba8814cc14e0;hp=5e3934ecad5d88db37b4c5fc20df7751228b33f7;hpb=fbcae49bf89a2ba1dbd7c1e4feb520d8ab6285fa;p=xonotic%2Fdarkplaces.git diff --git a/cd_shared.c b/cd_shared.c index 5e3934ec..aa33079d 100644 --- a/cd_shared.c +++ b/cd_shared.c @@ -157,9 +157,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_DPrintf ("Fake CD track %u playing...\n", track); + Con_Printf ("Fake CD track %u playing...\n", track); else - Con_DPrintf ("BGM track %s playing...\n", trackname); + Con_Printf ("BGM track %s playing...\n", trackname); } } @@ -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;