From 2c0c3dc067b6a77582475b85488a219d39410ac6 Mon Sep 17 00:00:00 2001 From: Alan Shen Date: Wed, 18 Nov 2026 22:47:09 -0700 Subject: [PATCH 1/5] Enable crosshair when saving crosshair settings The crosshair menu offers per-weapon "Use crosshair" options and a style, but no global on/off. A console "crosshair 0" (archived, so it persists in config.cfg) hides every style with nothing in the menu to explain why or undo it. Saving the crosshair settings now sets crosshair to 1, so choosing a style in the menu always shows it. --- src/game/client/neo/ui/neo_root_settings.cpp | 2 ++ src/game/client/neo/ui/neo_root_settings.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/game/client/neo/ui/neo_root_settings.cpp b/src/game/client/neo/ui/neo_root_settings.cpp index 4a03f030dc..ddd3c0b482 100644 --- a/src/game/client/neo/ui/neo_root_settings.cpp +++ b/src/game/client/neo/ui/neo_root_settings.cpp @@ -944,6 +944,8 @@ void NeoSettingsSave(const NeoSettings *ns) char szSequence[NEO_XHAIR_SEQMAX]; ExportCrosshair(const_cast(&pCrosshair->info), szSequence); cvr->cl_neo_crosshair.SetValue(szSequence); + // The menu has no global crosshair toggle, so a stale console "crosshair 0" would hide every style + cvr->crosshair.SetValue(true); cvr->cl_neo_crosshair_network.SetValue(pCrosshair->bNetworkCrosshair); cvr->cl_neo_crosshair_scope_inaccuracy.SetValue(pCrosshair->bInaccuracyInScope); cvr->cl_neo_crosshair_friendly_fire_warning.SetValue(pCrosshair->bFriendlyFireWarning); diff --git a/src/game/client/neo/ui/neo_root_settings.h b/src/game/client/neo/ui/neo_root_settings.h index 4e4d2d3304..228360f38e 100644 --- a/src/game/client/neo/ui/neo_root_settings.h +++ b/src/game/client/neo/ui/neo_root_settings.h @@ -343,6 +343,7 @@ struct NeoSettings CONVARREF_DEF(mat_monitorgamma); // Crosshair + CONVARREF_DEF(crosshair); CONVARREF_DEFNOGLOBALPTR(cl_neo_crosshair); CONVARREF_DEF(cl_neo_crosshair_network); CONVARREF_DEF(cl_neo_crosshair_scope_inaccuracy); From 1cd71b485686249f92e61a2cb21e186fc9530cee Mon Sep 17 00:00:00 2001 From: Alan Shen <1976941+sunzenshen@users.noreply.github.com> Date: Wed, 18 Nov 2026 22:56:15 -0700 Subject: [PATCH 2/5] tweak wording --- src/game/client/neo/ui/neo_root_settings.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/game/client/neo/ui/neo_root_settings.cpp b/src/game/client/neo/ui/neo_root_settings.cpp index ddd3c0b482..088e6409b1 100644 --- a/src/game/client/neo/ui/neo_root_settings.cpp +++ b/src/game/client/neo/ui/neo_root_settings.cpp @@ -944,8 +944,7 @@ void NeoSettingsSave(const NeoSettings *ns) char szSequence[NEO_XHAIR_SEQMAX]; ExportCrosshair(const_cast(&pCrosshair->info), szSequence); cvr->cl_neo_crosshair.SetValue(szSequence); - // The menu has no global crosshair toggle, so a stale console "crosshair 0" would hide every style - cvr->crosshair.SetValue(true); + cvr->crosshair.SetValue(true); // override disabled crosshair cvr->cl_neo_crosshair_network.SetValue(pCrosshair->bNetworkCrosshair); cvr->cl_neo_crosshair_scope_inaccuracy.SetValue(pCrosshair->bInaccuracyInScope); cvr->cl_neo_crosshair_friendly_fire_warning.SetValue(pCrosshair->bFriendlyFireWarning); From d3bec369a5e33e50661f622a39d97eeae682bf64 Mon Sep 17 00:00:00 2001 From: Alan Shen <1976941+sunzenshen@users.noreply.github.com> Date: Wed, 18 Nov 2026 22:57:02 -0700 Subject: [PATCH 3/5] move location --- src/game/client/neo/ui/neo_root_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/client/neo/ui/neo_root_settings.cpp b/src/game/client/neo/ui/neo_root_settings.cpp index 088e6409b1..521d05d594 100644 --- a/src/game/client/neo/ui/neo_root_settings.cpp +++ b/src/game/client/neo/ui/neo_root_settings.cpp @@ -944,10 +944,10 @@ void NeoSettingsSave(const NeoSettings *ns) char szSequence[NEO_XHAIR_SEQMAX]; ExportCrosshair(const_cast(&pCrosshair->info), szSequence); cvr->cl_neo_crosshair.SetValue(szSequence); - cvr->crosshair.SetValue(true); // override disabled crosshair cvr->cl_neo_crosshair_network.SetValue(pCrosshair->bNetworkCrosshair); cvr->cl_neo_crosshair_scope_inaccuracy.SetValue(pCrosshair->bInaccuracyInScope); cvr->cl_neo_crosshair_friendly_fire_warning.SetValue(pCrosshair->bFriendlyFireWarning); + cvr->crosshair.SetValue(true); // override disabled crosshair } { const NeoSettings::HUD *pHUD = &ns->hud; From 9c48b35eb7001a3b9c52c9eaec36a347262ce242 Mon Sep 17 00:00:00 2001 From: Alan Shen <1976941+sunzenshen@users.noreply.github.com> Date: Wed, 18 Nov 2026 22:57:53 -0700 Subject: [PATCH 4/5] more ordering --- src/game/client/neo/ui/neo_root_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/client/neo/ui/neo_root_settings.h b/src/game/client/neo/ui/neo_root_settings.h index 228360f38e..7dbef48e39 100644 --- a/src/game/client/neo/ui/neo_root_settings.h +++ b/src/game/client/neo/ui/neo_root_settings.h @@ -343,11 +343,11 @@ struct NeoSettings CONVARREF_DEF(mat_monitorgamma); // Crosshair - CONVARREF_DEF(crosshair); CONVARREF_DEFNOGLOBALPTR(cl_neo_crosshair); CONVARREF_DEF(cl_neo_crosshair_network); CONVARREF_DEF(cl_neo_crosshair_scope_inaccuracy); CONVARREF_DEF(cl_neo_crosshair_friendly_fire_warning); + CONVARREF_DEF(crosshair); // Friendly Markers CONVARREF_DEFNOGLOBALPTR(cl_neo_squad_marker); From 4516286611c29017109b422de782644a2f15ffbe Mon Sep 17 00:00:00 2001 From: Alan Shen <1976941+sunzenshen@users.noreply.github.com> Date: Wed, 18 Nov 2026 23:19:31 -0700 Subject: [PATCH 5/5] more tweaking of wording --- src/game/client/neo/ui/neo_root_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/client/neo/ui/neo_root_settings.cpp b/src/game/client/neo/ui/neo_root_settings.cpp index 521d05d594..c62a6ab130 100644 --- a/src/game/client/neo/ui/neo_root_settings.cpp +++ b/src/game/client/neo/ui/neo_root_settings.cpp @@ -947,7 +947,7 @@ void NeoSettingsSave(const NeoSettings *ns) cvr->cl_neo_crosshair_network.SetValue(pCrosshair->bNetworkCrosshair); cvr->cl_neo_crosshair_scope_inaccuracy.SetValue(pCrosshair->bInaccuracyInScope); cvr->cl_neo_crosshair_friendly_fire_warning.SetValue(pCrosshair->bFriendlyFireWarning); - cvr->crosshair.SetValue(true); // override disabled crosshair + cvr->crosshair.SetValue(true); // accepting crosshair changes implies enabling it } { const NeoSettings::HUD *pHUD = &ns->hud;