r1051 - in trunk: . code/client

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2007-03-17 11:54:37 -0400 (Sat, 17 Mar 2007)
New Revision: 1051

Modified:
   trunk/README
   trunk/code/client/snd_openal.c
Log:
Remove cvar s_alMaxSpeakerDistance for the same task can better be achieved with s_alMaxDistance.


Modified: trunk/README
===================================================================
--- trunk/README	2007-03-07 06:36:39 UTC (rev 1050)
+++ trunk/README	2007-03-17 15:54:37 UTC (rev 1051)
@@ -125,8 +125,6 @@
                                       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

Modified: trunk/code/client/snd_openal.c
===================================================================
--- trunk/code/client/snd_openal.c	2007-03-07 06:36:39 UTC (rev 1050)
+++ trunk/code/client/snd_openal.c	2007-03-17 15:54:37 UTC (rev 1051)
@@ -42,7 +42,6 @@
 cvar_t *s_alDriver;
 cvar_t *s_alDevice;
 cvar_t *s_alAvailableDevices;
-cvar_t *s_alMaxSpeakerDistance;
 
 /*
 =================
@@ -1096,8 +1095,8 @@
 	// 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 @@
 	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 );