From 4ebe0313412ebb745d4d12a2b2dde4465608fafa Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 22 Jan 2023 12:28:48 +0100
Subject: [PATCH] Disable BHit raytrace z-buffer by default

---
 r5dev/public/idebugoverlay.h | 4 ++--
 r5dev/tier1/IConVar.cpp      | 2 +-
 r5dev/vstdlib/callback.cpp   | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/r5dev/public/idebugoverlay.h b/r5dev/public/idebugoverlay.h
index a37dcb8e..8a4970df 100644
--- a/r5dev/public/idebugoverlay.h
+++ b/r5dev/public/idebugoverlay.h
@@ -27,10 +27,10 @@ public:
 		const static int index = 3;
 		CallVFunc<void>(index, this, vOrigin, flRadius, nTheta, nPhi, r, g, b, a, flDuration);
 	}
-	void AddLineOverlay(const Vector3D& vStart, const Vector3D& vEnd, int r, int g, int b, char bZBuffer, float flDuration)
+	void AddLineOverlay(const Vector3D& vStart, const Vector3D& vEnd, int r, int g, int b, char noDepthTest, float flDuration)
 	{
 		const static int index = 5;
-		CallVFunc<void>(index, this, vStart, vEnd, r, g, b, bZBuffer, flDuration);
+		CallVFunc<void>(index, this, vStart, vEnd, r, g, b, noDepthTest, flDuration);
 	}
 	void AddCapsuleOverlay(const Vector3D& vStart, const Vector3D& vEnd, const Vector3D& vRadius, const Vector3D& vTop, const Vector3D& vBottom, int r, int g, int b, int a, float flDuration)
 	{
diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp
index 128d5c91..318a3b8e 100644
--- a/r5dev/tier1/IConVar.cpp
+++ b/r5dev/tier1/IConVar.cpp
@@ -119,7 +119,7 @@ void ConVar::Init(void)
 #endif // DEDICATED
 #endif // !CLIENT_DLL
 #if !defined (GAMEDLL_S0) && !defined (GAMEDLL_S1)
-	bhit_zbuffer    = ConVar::Create("bhit_zbuffer"   , "1", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED, "Use z-buffer for bullet ray trace overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
+	bhit_zbuffer    = ConVar::Create("bhit_zbuffer"   , "0", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED, "Use z-buffer for bullet ray trace overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
 	bhit_abs_origin = ConVar::Create("bhit_abs_origin", "1", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED, "Draw entity's predicted abs origin upon bullet impact for trajectory debugging (requires 'r_visualizetraces' to be set!).", false, 0.f, false, 0.f, nullptr, nullptr);
 #endif // !GAMEDLL_S0 && !GAMEDLL_S1
 	//-------------------------------------------------------------------------
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index 21ec43bd..e4e4c36c 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -1173,9 +1173,8 @@ void BHit_f(const CCommand& args)
 
 		g_pEngineTraceServer->TraceRay(ray, TRACE_MASK_NPCWORLDSTATIC, &trace);
 
-		g_pDebugOverlay->AddLineOverlay(trace.startpos, trace.endpos, 0, 255, 0, bhit_zbuffer->GetBool(), sv_visualizetraces_duration->GetFloat());
-		g_pDebugOverlay->AddLineOverlay(trace.endpos, vecAbsEnd, 255, 0, 0, bhit_zbuffer->GetBool(), sv_visualizetraces_duration->GetFloat());
-
+		g_pDebugOverlay->AddLineOverlay(trace.startpos, trace.endpos, 0, 255, 0, !bhit_zbuffer->GetBool(), sv_visualizetraces_duration->GetFloat());
+		g_pDebugOverlay->AddLineOverlay(trace.endpos, vecAbsEnd, 255, 0, 0, !bhit_zbuffer->GetBool(), sv_visualizetraces_duration->GetFloat());
 	}
 
 	if (bhit_abs_origin->GetBool() && r_visualizetraces->GetBool())