From 0f1cb315d6a8cbf8c30eefb04cb1309ff63d1e00 Mon Sep 17 00:00:00 2001
From: Andrey Akhmichin <15944199+nekonomicon@users.noreply.github.com>
Date: Mon, 1 May 2023 02:04:06 +0500
Subject: [PATCH 1/2] Revert "Rename "cl_viewbob" cvar to "cl_bobtilt"."

This reverts commit 5eeb649cec2f4f3ab0a5ba07b37b695475ff5cb3.
---
 cl_dll/hud.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cl_dll/hud.cpp b/cl_dll/hud.cpp
index 9c3f333f..5155993e 100644
--- a/cl_dll/hud.cpp
+++ b/cl_dll/hud.cpp
@@ -383,7 +383,7 @@ void CHud::Init( void )
 	m_pCvarStealMouse = CVAR_CREATE( "hud_capturemouse", "1", FCVAR_ARCHIVE );
 	m_pCvarDraw = CVAR_CREATE( "hud_draw", "1", FCVAR_ARCHIVE );
 	cl_lw = gEngfuncs.pfnGetCvarPointer( "cl_lw" );
-	cl_viewbob = CVAR_CREATE( "cl_bobtilt", "0", FCVAR_ARCHIVE );
+	cl_viewbob = CVAR_CREATE( "cl_viewbob", "0", FCVAR_ARCHIVE );
 #if GOLDSOURCE_SUPPORT
 	if( gEngfuncs.pfnGetCvarPointer( "build" ))
 	{

From 1ed4c1d899c083a494b4ca0de41d02d6f043d7fa Mon Sep 17 00:00:00 2001
From: Andrey Akhmichin <15944199+nekonomicon@users.noreply.github.com>
Date: Mon, 1 May 2023 02:10:06 +0500
Subject: [PATCH 2/2] Always change view rolling on client side.

---
 cl_dll/hud.cpp  | 14 ++------------
 cl_dll/view.cpp | 12 +++---------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/cl_dll/hud.cpp b/cl_dll/hud.cpp
index 5155993e..bc87f630 100644
--- a/cl_dll/hud.cpp
+++ b/cl_dll/hud.cpp
@@ -95,7 +95,6 @@ float g_hud_text_color[3];
 extern client_sprite_t *GetSpriteList( client_sprite_t *pList, const char *psz, int iRes, int iCount );
 
 extern cvar_t *sensitivity;
-qboolean bIsXash;
 cvar_t *cl_lw = NULL;
 cvar_t *cl_viewbob = NULL;
 cvar_t *cl_rollspeed;
@@ -384,17 +383,8 @@ void CHud::Init( void )
 	m_pCvarDraw = CVAR_CREATE( "hud_draw", "1", FCVAR_ARCHIVE );
 	cl_lw = gEngfuncs.pfnGetCvarPointer( "cl_lw" );
 	cl_viewbob = CVAR_CREATE( "cl_viewbob", "0", FCVAR_ARCHIVE );
-#if GOLDSOURCE_SUPPORT
-	if( gEngfuncs.pfnGetCvarPointer( "build" ))
-	{
-		bIsXash = true;
-	}
-	else
-	{
-		cl_rollangle = gEngfuncs.pfnRegisterVariable( "cl_rollangle", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE );
-		cl_rollspeed = gEngfuncs.pfnRegisterVariable( "cl_rollspeed", "200", FCVAR_CLIENTDLL | FCVAR_ARCHIVE );
-	}
-#endif
+	cl_rollangle = gEngfuncs.pfnRegisterVariable( "cl_rollangle", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE );
+	cl_rollspeed = gEngfuncs.pfnRegisterVariable( "cl_rollspeed", "200", FCVAR_CLIENTDLL | FCVAR_ARCHIVE );
 	m_pSpriteList = NULL;
 
 	// Clear any old HUD list
diff --git a/cl_dll/view.cpp b/cl_dll/view.cpp
index 5c6316a5..f0a5deef 100644
--- a/cl_dll/view.cpp
+++ b/cl_dll/view.cpp
@@ -313,7 +313,6 @@ void V_AddIdle( struct ref_params_s *pparams )
 	pparams->viewangles[YAW] += v_idlescale * sin( pparams->time * v_iyaw_cycle.value ) * v_iyaw_level.value;
 }
 
-extern qboolean bIsXash;
 extern cvar_t *cl_rollspeed;
 extern cvar_t *cl_rollangle;
 
@@ -332,14 +331,9 @@ void V_CalcViewRoll( struct ref_params_s *pparams )
 	viewentity = gEngfuncs.GetEntityByIndex( pparams->viewentity );
 	if( !viewentity )
 		return;
-#if GOLDSOURCE_SUPPORT
-	if( bIsXash )
-		side = V_CalcRoll( viewentity->angles, pparams->simvel, pparams->movevars->rollangle, pparams->movevars->rollspeed );
-	else
-		side = V_CalcRoll( viewentity->angles, pparams->simvel, cl_rollangle->value, cl_rollspeed->value );
-#else
-	side = V_CalcRoll( viewentity->angles, pparams->simvel, pparams->movevars->rollangle, pparams->movevars->rollspeed );
-#endif
+
+	side = V_CalcRoll( viewentity->angles, pparams->simvel, cl_rollangle->value, cl_rollspeed->value );
+
 	pparams->viewangles[ROLL] += side;
 
 	if( pparams->health <= 0 && ( pparams->viewheight[2] != 0 ) )