From dd6b9c12a490094bc589ead83b11c8f2c720af3f Mon Sep 17 00:00:00 2001
From: nullsystem <15316579+nullsystem@users.noreply.github.com>
Date: Tue, 26 May 2026 23:19:18 +0100
Subject: [PATCH] Fixup FF crosshair being shown in hipfire when hipfire off

Just move the logic to under if show crosshair bool so it only
shows when there's would be a (non-FF) crosshair to show.
---
 src/game/client/hud_crosshair.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/game/client/hud_crosshair.cpp b/src/game/client/hud_crosshair.cpp
index aa15f0fc23..3823402536 100644
--- a/src/game/client/hud_crosshair.cpp
+++ b/src/game/client/hud_crosshair.cpp
@@ -618,19 +618,19 @@ void CHudCrosshair::Paint( void )
 			}
 		}
 	}
-	else if (showFriendlyFireCrosshair)
-	{
-		vgui::surface()->DrawSetTexture(m_iTexIFFId);
-		int iTexWide, iTexTall;
-		vgui::surface()->DrawGetTextureSize(m_iTexIFFId, iTexWide, iTexTall);
-		iTexWide >>= 2;
-		iTexTall >>= 2;
-		vgui::surface()->DrawSetColor(COLOR_RED);
-		vgui::surface()->DrawTexturedRect(iX - iTexWide, iY - iTexTall, iX + iTexWide, iY + iTexTall);
-	}
 	else if (!bHideCrosshair)
 	{
-		if (iTexXHId > 0)
+		if (showFriendlyFireCrosshair)
+		{
+			vgui::surface()->DrawSetTexture(m_iTexIFFId);
+			int iTexWide, iTexTall;
+			vgui::surface()->DrawGetTextureSize(m_iTexIFFId, iTexWide, iTexTall);
+			iTexWide >>= 2;
+			iTexTall >>= 2;
+			vgui::surface()->DrawSetColor(COLOR_RED);
+			vgui::surface()->DrawTexturedRect(iX - iTexWide, iY - iTexTall, iX + iTexWide, iY + iTexTall);
+		}
+		else if (iTexXHId > 0)
 		{
 			vgui::surface()->DrawSetTexture(iTexXHId);
 			int iTexWide, iTexTall;