From 3c62c2be5a27936625873e91e90c04cf50d783a7 Mon Sep 17 00:00:00 2001 From: svdijk Date: Wed, 8 May 2013 20:06:53 +0200 Subject: [PATCH] ogg/cda: move defaults from yq2.cfg to engine --- src/backends/sdl/cd.c | 4 ++++ src/client/sound/ogg.c | 4 ++-- stuff/yq2.cfg | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/backends/sdl/cd.c b/src/backends/sdl/cd.c index 094789e2..9e0ff276 100644 --- a/src/backends/sdl/cd.c +++ b/src/backends/sdl/cd.c @@ -332,7 +332,11 @@ CDAudio_Init() return -1; } +#ifdef OGG + cd_nocd = Cvar_Get("cd_nocd", "1", CVAR_ARCHIVE); +#else cd_nocd = Cvar_Get("cd_nocd", "0", CVAR_ARCHIVE); +#endif if (cd_nocd->value) { diff --git a/src/client/sound/ogg.c b/src/client/sound/ogg.c index ae9a6dbf..5668b321 100644 --- a/src/client/sound/ogg.c +++ b/src/client/sound/ogg.c @@ -74,7 +74,7 @@ OGG_Init(void) Com_Printf("Starting Ogg Vorbis.\n"); /* Skip initialization if disabled. */ - cv = Cvar_Get("ogg_enable", "0", CVAR_ARCHIVE); + cv = Cvar_Get("ogg_enable", "1", CVAR_ARCHIVE); if (cv->value != 1) { @@ -696,7 +696,7 @@ OGG_ParseCmd(char *arg) int n; cvar_t *ogg_enable; - ogg_enable = Cvar_Get("ogg_enable", "0", CVAR_ARCHIVE); + ogg_enable = Cvar_Get("ogg_enable", "1", CVAR_ARCHIVE); switch (arg[0]) { diff --git a/stuff/yq2.cfg b/stuff/yq2.cfg index ef1f47a3..682fda12 100644 --- a/stuff/yq2.cfg +++ b/stuff/yq2.cfg @@ -81,5 +81,3 @@ set m_side 0.8 set lookspring 0 set lookstrafe 0 set freelook 1 -set ogg_enable 1 -set cd_nocd 1