From fa42357891bbc1f2125f3e9f24e2c470726bb1d4 Mon Sep 17 00:00:00 2001
From: Alexander <mmaulwurff@gmail.com>
Date: Sat, 18 May 2019 16:05:57 +0700
Subject: [PATCH] added a crosshair on/off toggle

# Conflicts:
#	wadsrc/static/menudef.txt
---
 src/g_statusbar/shared_sbar.cpp | 8 ++++++++
 wadsrc/static/menudef.txt       | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp
index c518e4246..e1270c911 100644
--- a/src/g_statusbar/shared_sbar.cpp
+++ b/src/g_statusbar/shared_sbar.cpp
@@ -131,6 +131,7 @@ CUSTOM_CVAR(Bool, hud_aspectscale, false, CVAR_ARCHIVE)
 	}
 }
 
+CVAR (Bool, crosshairon, true, CVAR_ARCHIVE);
 CVAR (Int, crosshair, 0, CVAR_ARCHIVE)
 CVAR (Bool, crosshairforce, false, CVAR_ARCHIVE)
 CVAR (Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE);
@@ -896,9 +897,16 @@ void DBaseStatusBar::DrawCrosshair ()
 	double size;
 	int w, h;
 
+	if (!crosshairon)
+	{
+		return;
+	}
+
 	// Don't draw the crosshair in chasecam mode
 	if (players[consoleplayer].cheats & CF_CHASECAM)
+	{
 		return;
+	}
 
 	ST_LoadCrosshair();
 
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index fee3ce7ae..f6f9e692f 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -937,6 +937,7 @@ OptionMenu "HUDOptions" protected
 	Submenu "$HUDMNU_FLASH", 				"FlashOptions"
 	Submenu "$DSPLYMNU_SCOREBOARD", 		"ScoreboardOptions"
 	StaticText " "
+	Option "$HUDMNU_CROSSHAIRON",			"crosshairon", "OnOff"
 	Option "$HUDMNU_CROSSHAIR",				"crosshair", "Crosshairs"
 	Option "$HUDMNU_FORCECROSSHAIR",		"crosshairforce", "OnOff"
 	Option "$HUDMNU_GROWCROSSHAIR",			"crosshairgrow", "OnOff"