From 1de9a065bf143de47c06112c0289d984cbd48baf Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Sat, 17 Mar 2007 15:54:37 +0000 Subject: [PATCH] Remove cvar s_alMaxSpeakerDistance for the same task can better be achieved with s_alMaxDistance. --- README | 2 -- code/client/snd_openal.c | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README b/README index d5d0c179..da52d20c 100644 --- a/README +++ b/README @@ -125,8 +125,6 @@ New cvars source s_alGraceDistance - after having passed MaxDistance, length until sounds are completely inaudible. - s_alMaxSpeakerDistance - ET_SPEAKERS beyond this distance are - culled s_alDriver - which OpenAL library to use s_alDevice - which OpenAL device to use s_alAvailableDevices - list of available OpenAL devices diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c index b20e411e..a93c2d2c 100644 --- a/code/client/snd_openal.c +++ b/code/client/snd_openal.c @@ -42,7 +42,6 @@ cvar_t *s_alGraceDistance; cvar_t *s_alDriver; cvar_t *s_alDevice; cvar_t *s_alAvailableDevices; -cvar_t *s_alMaxSpeakerDistance; /* ================= @@ -1096,8 +1095,8 @@ void S_AL_AddRealLoopingSound( int entityNum, const vec3_t origin, const vec3_t // There are certain maps (*cough* Q3:TA mpterra*) that have large quantities // of ET_SPEAKERS in the PVS at any given time. OpenAL can't cope with mixing // large numbers of sounds, so this culls them by distance - if( DistanceSquared( origin, lastListenerOrigin ) > - s_alMaxSpeakerDistance->value * s_alMaxSpeakerDistance->value ) + if( DistanceSquared( origin, lastListenerOrigin ) > (s_alMaxDistance->value + s_alGraceDistance->value) * + (s_alMaxDistance->value + s_alGraceDistance->value) ) return; S_AL_SrcLoop(SRCPRI_AMBIENT, sfx, origin, velocity, entityNum); @@ -1883,7 +1882,6 @@ qboolean S_AL_Init( soundInterface_t *si ) s_alMaxDistance = Cvar_Get("s_alMaxDistance", "1024", CVAR_CHEAT); s_alRolloff = Cvar_Get( "s_alRolloff", "2", CVAR_CHEAT); s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_CHEAT); - s_alMaxSpeakerDistance = Cvar_Get( "s_alMaxSpeakerDistance", "1024", CVAR_ARCHIVE ); s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE );