Cvar merge... segfault problems... also unknown problems in vid_svga.c

This commit is contained in:
Dan Olson 2000-05-16 04:47:41 +00:00
parent 5c58a21a1c
commit 1d26c02826
74 changed files with 4288 additions and 1509 deletions

View file

@ -30,7 +30,9 @@
#include "quakedef.h"
extern HWND mainwindow;
extern cvar_t bgmvolume;
/* extern cvar_t bgmvolume;
CVAR_FIXME */
extern cvar_t *bgmvolume;
static qboolean cdValid = false;
static qboolean playing = false;
@ -406,18 +408,24 @@ void CDAudio_Update(void)
if (!enabled)
return;
if (bgmvolume.value != cdvolume)
/* if (bgmvolume.value != cdvolume)
CVAR_FIXME */
if (bgmvolume->value != cdvolume)
{
if (cdvolume)
{
Cvar_SetValue ("bgmvolume", 0.0);
cdvolume = bgmvolume.value;
/* cdvolume = bgmvolume.value;
CVAR_FIXME */
cdvolume = bgmvolume->value;
CDAudio_Pause ();
}
else
{
Cvar_SetValue ("bgmvolume", 1.0);
cdvolume = bgmvolume.value;
/* cdvolume = bgmvolume.value;
CVAR_FIXME */
cdvolume = bgmvolume->value;
CDAudio_Resume ();
}
}