* Merge ioq3-r1458

8 files changed, 25 insertions, 18 deletions

diff --git a/src/client/cl_cin.c b/src/client/cl_cin.c
index bf8501f1..1443937c 100644
--- a/src/client/cl_cin.c
+++ b/src/client/cl_cin.c
@@ -136,7 +136,6 @@ static int				currentHandle = -1;
 static int				CL_handle = -1;
 
 extern int				s_soundtime;		// sample PAIRS
-extern int   			s_paintedtime; 		// sample PAIRS
 
 
 void CIN_CloseAllVideos(void) {
diff --git a/src/client/cl_input.c b/src/client/cl_input.c
index 30352aa3..cb95ce8c 100644
--- a/src/client/cl_input.c
+++ b/src/client/cl_input.c
@@ -454,8 +454,7 @@ void CL_MouseMove( usercmd_t *cmd ) {
 	cl.mouseDy[cl.mouseIndex] = 0;
 
 	rate = sqrt( mx * mx + my * my ) / (float)frame_msec;
-	accelSensitivity = ( cl_sensitivity->value *
-			cl_platformSensitivity->value ) + rate * cl_mouseAccel->value;
+	accelSensitivity = cl_sensitivity->value + rate * cl_mouseAccel->value;
 
 	// scale by FOV
 	accelSensitivity *= cl.cgameSensitivity;
diff --git a/src/client/cl_keys.c b/src/client/cl_keys.c
index 7c982c4b..8b9dcf4d 100644
--- a/src/client/cl_keys.c
+++ b/src/client/cl_keys.c
@@ -1116,7 +1116,6 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
 		{
 			if (keys[K_ALT].down)
 			{
-//				Key_ClearStates();  // Thilo: why should we clear the key states here?
 				Cvar_SetValue( "r_fullscreen",
 						!Cvar_VariableIntegerValue( "r_fullscreen" ) );
 				return;
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index 444b877d..0bba97d0 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -72,7 +72,6 @@ cvar_t	*cl_forceavidemo;
 
 cvar_t	*cl_freelook;
 cvar_t	*cl_sensitivity;
-cvar_t	*cl_platformSensitivity;
 
 cvar_t	*cl_mouseAccel;
 cvar_t	*cl_showMouseRate;
@@ -2974,7 +2973,6 @@ void CL_Init( void ) {
 
 	cl_run = Cvar_Get ("cl_run", "1", CVAR_ARCHIVE);
 	cl_sensitivity = Cvar_Get ("sensitivity", "5", CVAR_ARCHIVE);
-	cl_platformSensitivity = Cvar_Get ("cl_platformSensitivity", "1.0", CVAR_ROM);
 	cl_mouseAccel = Cvar_Get ("cl_mouseAccel", "0", CVAR_ARCHIVE);
 	cl_freelook = Cvar_Get( "cl_freelook", "1", CVAR_ARCHIVE );
 
@@ -3126,7 +3124,7 @@ void CL_Shutdown( void ) {
 	Com_Printf( "----- CL_Shutdown -----\n" );
 
 	if ( recursive ) {
-		printf ("recursive shutdown\n");
+		Com_Printf( "WARNING: Recursive shutdown\n" );
 		return;
 	}
 	recursive = qtrue;
diff --git a/src/client/cl_scrn.c b/src/client/cl_scrn.c
index cf89fb9d..c44950f2 100644
--- a/src/client/cl_scrn.c
+++ b/src/client/cl_scrn.c
@@ -321,9 +321,13 @@ int	SCR_GetBigStringWidth( const char *str ) {
 
 //===============================================================================
 
+
+#ifdef USE_VOIP
 /*
 =================
 SCR_DrawVoipMeter
+
+FIXME: inherited from ioq3, move to cgame/ui
 =================
 */
 void SCR_DrawVoipMeter( void ) {
@@ -357,6 +361,7 @@ void SCR_DrawVoipMeter( void ) {
 	sprintf( string, "VoIP: [%s]", buffer );
 	SCR_DrawStringExt( 320 - strlen( string ) * 4, 10, 8, string, g_color_table[7], qtrue, qfalse );
 }
+#endif
 
 
 
diff --git a/src/client/client.h b/src/client/client.h
index a3cbadfb..d7f430cb 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -376,7 +376,6 @@ extern	cvar_t	*cl_run;
 extern	cvar_t	*cl_anglespeedkey;
 
 extern	cvar_t	*cl_sensitivity;
-extern	cvar_t	*cl_platformSensitivity;
 extern	cvar_t	*cl_freelook;
 
 extern	cvar_t	*cl_mouseAccel;
@@ -491,8 +490,6 @@ void CL_VerifyCode( void );
 
 float CL_KeyState (kbutton_t *key);
 char *Key_KeynumToString (int keynum);
-int Key_GetCatcher( void );
-void Key_SetCatcher( int catcher );
 
 //
 // cl_parse.c
diff --git a/src/client/snd_dma.c b/src/client/snd_dma.c
index d9fea8d4..a418733a 100644
--- a/src/client/snd_dma.c
+++ b/src/client/snd_dma.c
@@ -39,7 +39,6 @@ void S_SoundList_f(void);
 void S_Music_f(void);
 
 void S_Update_( void );
-void S_UpdateBackgroundTrack( void );
 void S_Base_StopAllSounds(void);
 void S_Base_StopBackgroundTrack( void );
 
diff --git a/src/client/snd_openal.c b/src/client/snd_openal.c
index 5fad0a45..5421a7a0 100644
--- a/src/client/snd_openal.c
+++ b/src/client/snd_openal.c
@@ -1992,7 +1992,7 @@ qboolean S_AL_Init( soundInterface_t *si )
 
 	// New console variables
 	s_alPrecache = Cvar_Get( "s_alPrecache", "1", CVAR_ARCHIVE );
-	s_alGain = Cvar_Get( "s_alGain", "0.4", CVAR_ARCHIVE );
+	s_alGain = Cvar_Get( "s_alGain", "1.0", CVAR_ARCHIVE );
 	s_alSources = Cvar_Get( "s_alSources", "96", CVAR_ARCHIVE );
 	s_alDopplerFactor = Cvar_Get( "s_alDopplerFactor", "1.0", CVAR_ARCHIVE );
 	s_alDopplerSpeed = Cvar_Get( "s_alDopplerSpeed", "2200", CVAR_ARCHIVE );
@@ -2095,22 +2095,33 @@ qboolean S_AL_Init( soundInterface_t *si )
 	// !!! FIXME: add support for capture device enumeration.
 	// !!! FIXME: add some better error reporting.
 	s_alCapture = Cvar_Get( "s_alCapture", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	if (!s_alCapture->integer) {
+	if (!s_alCapture->integer)
+	{
 		Com_Printf("OpenAL capture support disabled by user ('+set s_alCapture 1' to enable)\n");
+	}
 #if USE_MUMBLE
-	} else if (cl_useMumble->integer) {
+	else if (cl_useMumble->integer)
+	{
 		Com_Printf("OpenAL capture support disabled for Mumble support\n");
+	}
 #endif
-	} else {
+	else
+	{
+#ifdef MACOS_X
 		// !!! FIXME: Apple has a 1.1-compliant OpenAL, which includes
 		// !!! FIXME:  capture support, but they don't list it in the
 		// !!! FIXME:  extension string. We need to check the version string,
 		// !!! FIXME:  then the extension string, but that's too much trouble,
 		// !!! FIXME:  so we'll just check the function pointer for now.
-		//if (qalcIsExtensionPresent(NULL, "ALC_EXT_capture")) {
-		if (qalcCaptureOpenDevice == NULL) {
+		if (qalcCaptureOpenDevice == NULL)
+#else
+		if (!qalcIsExtensionPresent(NULL, "ALC_EXT_capture"))
+#endif
+		{
 			Com_Printf("No ALC_EXT_capture support, can't record audio.\n");
-		} else {
+		}
+		else
+		{
 			// !!! FIXME: 8000Hz is what Speex narrowband mode needs, but we
 			// !!! FIXME:  should probably open the capture device after
 			// !!! FIXME:  initializing Speex so we can change to wideband