Add check for new "sv_allow_autoaim".

Author: nekonomicon

dlls/game.cpp

@@ -57,10 +57,11 @@ cvar_t multibyte_only = { "mp_multibyte_only", "0", FCVAR_SERVER };
 cvar_t mp_chattime	= { "mp_chattime","10", FCVAR_SERVER };
 
 // Engine Cvars
-cvar_t *g_psv_gravity = NULL;
-cvar_t *g_psv_aim = NULL;
-cvar_t *g_footsteps = NULL;
-cvar_t *g_enable_cheats = NULL;
+cvar_t *g_psv_gravity;
+cvar_t *g_psv_aim;
+cvar_t *g_psv_allow_autoaim;
+cvar_t *g_footsteps;
+cvar_t *g_enable_cheats;
 
 cvar_t *g_psv_developer;
 
@@ -468,6 +469,7 @@ void GameDLLInit( void )
 {
 	g_psv_gravity = CVAR_GET_POINTER( "sv_gravity" );
 	g_psv_aim = CVAR_GET_POINTER( "sv_aim" );
+	g_psv_allow_autoaim = CVAR_GET_POINTER( "sv_allow_autoaim" );
 	g_footsteps = CVAR_GET_POINTER( "mp_footsteps" );
 
 	g_psv_developer = CVAR_GET_POINTER( "developer" );

dlls/game.h

@@ -49,6 +49,7 @@ extern cvar_t sv_busters;
 // Engine Cvars
 extern cvar_t *g_psv_gravity;
 extern cvar_t *g_psv_aim;
+extern cvar_t *g_psv_allow_autoaim;
 extern cvar_t *g_footsteps;
 extern cvar_t *g_enable_cheats;
 

dlls/player.cpp

@@ -4360,7 +4360,7 @@ Vector CBasePlayer::GetAutoaimVector( float flDelta )
 	// m_vecAutoAim = m_vecAutoAim * 0.99;
 
 	// Don't send across network if sv_aim is 0
-	if( g_psv_aim->value != 0 )
+	if( g_psv_aim->value && g_psv_allow_autoaim && g_psv_allow_autoaim->value )
 	{
 		if( m_vecAutoAim.x != m_lastx || m_vecAutoAim.y != m_lasty )
 		{
@@ -4386,7 +4386,7 @@ Vector CBasePlayer::AutoaimDeflection( Vector &vecSrc, float flDist, float flDel
 	edict_t *bestent;
 	TraceResult tr;
 
-	if( g_psv_aim->value == 0 )
+	if( !( g_psv_aim->value && g_psv_allow_autoaim && g_psv_allow_autoaim->value ))
 	{
 		m_fOnTarget = FALSE;
 		return g_vecZero;