Lowered crosshair stuffs

phoenixprojectsoftware · Oct 27, 2023 · 7859161 · 7859161
1 parent 02d6f6c
commit 7859161
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/cl_dll/ev_common.cpp b/cl_dll/ev_common.cpp
@@ -34,6 +34,8 @@ extern cvar_t *cl_viewmodel_ofs_up;
 
 extern CGameStudioModelRenderer g_StudioRenderer;
 
+extern cvar_s* crosshair_low;
+
 /*
 =================
 GetEntity
@@ -112,6 +114,7 @@ void EV_GetGunPosition( event_args_t *args, float *pos, float *origin )
 {
 	int idx;
 	vec3_t view_ofs;
+	vec3_t up;
 
 	idx = args->entindex;
 
@@ -133,6 +136,12 @@ void EV_GetGunPosition( event_args_t *args, float *pos, float *origin )
 	}
 
 	VectorAdd( origin, view_ofs, pos );
+
+	if (EV_IsLocal(idx) && !IS_FIRSTPERSON_SPEC)
+	{
+		// TODO : Add CVAR check
+		pos[2] -= 5.0f;
+	}
 }
 
 /*

diff --git a/cl_dll/hud_crosshairs.cpp b/cl_dll/hud_crosshairs.cpp
@@ -3,12 +3,14 @@
 #include "parsemsg.h"
 #include "hudgl.h"
 
+extern cvar_t *crosshair_low;
+
 int CHudCrosshairs::Init()
 {
 	m_iFlags = HUD_ACTIVE;
 
 	cl_cross =               CVAR_CREATE("cl_cross", "0", FCVAR_ARCHIVE);
-	cl_cross_low =			 CVAR_CREATE("cl_cross_low", "1", FCVAR_ARCHIVE);
+	cl_cross_low =			 crosshair_low;//CVAR_CREATE("cl_cross_low", "1", FCVAR_ARCHIVE);
 	cl_cross_color =         CVAR_CREATE("cl_cross_color", "0 255 0", FCVAR_ARCHIVE);
 	cl_cross_alpha =         CVAR_CREATE("cl_cross_alpha", "200", FCVAR_ARCHIVE);
 	cl_cross_thickness =     CVAR_CREATE("cl_cross_thickness", "2", FCVAR_ARCHIVE);
@@ -52,10 +54,7 @@ int CHudCrosshairs::Draw(float time)
 	}
 
 
-		Vector2D center(ScreenWidth / 2.0f, ScreenHeight / 1.8f);
-
-
-
+	Vector2D center(ScreenWidth / 2.0f, ScreenHeight / ((int)cl_cross_low->value > 0 ? 1.8f : 2.0f));
 
 	HudGL gl;
 

diff --git a/cl_dll/view.cpp b/cl_dll/view.cpp
@@ -124,6 +124,8 @@ cvar_t	v_ipitch_level = { "v_ipitch_level", "0.3", 0, 0.3 };
 
 float	v_idlescale;  // used by TFC for concussion grenade effect
 
+cvar_s* crosshair_low;
+
 //=============================================================================
 /*
 void V_NormalizeAngles( vec3_t angles )
@@ -479,6 +481,8 @@ void V_CalcGunAngle(struct ref_params_s* pparams)
 
 	VectorCopy(viewent->angles, viewent->curstate.angles);
 	VectorCopy(viewent->angles, viewent->latched.prevangles);
+
+	pparams->crosshairangle[0] = -((int)crosshair_low->value > 0 ? 5.0f : 0.0f);
 }
 
 /*
@@ -2029,6 +2033,8 @@ void V_Init(void)
 	cl_mp5_punch_roll_enabled = gEngfuncs.pfnRegisterVariable("cl_mp5_punch_roll_enabled", "1", FCVAR_ARCHIVE);
 	cl_m249_new_punch_enabled = gEngfuncs.pfnRegisterVariable("cl_m249_new_punch_enabled", "1", FCVAR_ARCHIVE);
 	cl_shockrifle_punch_enabled = gEngfuncs.pfnRegisterVariable("cl_shockrifle_punch_enabled", "1", FCVAR_ARCHIVE);
+
+	crosshair_low = gEngfuncs.pfnRegisterVariable("crosshair_low", "1", FCVAR_ARCHIVE);
 }