From 6631813cf904fdb9973bfd02c72b0bee891c2a37 Mon Sep 17 00:00:00 2001
From: Ian <motolegacy.git@gmail.com>
Date: Mon, 16 Oct 2023 15:59:22 -0400
Subject: [PATCH 1/3] SERVER: Let host engine dictate max AI at once

---
 source/server/ai/zombie_core.qc | 13 ++++++++++++-
 source/server/defs/custom.qc    | 11 -----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/server/ai/zombie_core.qc b/source/server/ai/zombie_core.qc
index aed4cf3..baa28ca 100644
--- a/source/server/ai/zombie_core.qc
+++ b/source/server/ai/zombie_core.qc
@@ -1553,7 +1553,18 @@ void() spawnAllZombEnts =
 	local float i;
 	i = 0;
 
-	while(i < MAX_ZOMB)
+	// cypress -- let host engine dictate
+	// max ai at once.
+
+#ifdef FTE
+
+	while(i < 24)
+
+#else
+
+	while(i < nzp_maxai())
+
+#endif // FTE
 	{
 		spawnSingleZombEnt(i);
 		i++;
diff --git a/source/server/defs/custom.qc b/source/server/defs/custom.qc
index 9adda11..ea5b150 100644
--- a/source/server/defs/custom.qc
+++ b/source/server/defs/custom.qc
@@ -248,17 +248,6 @@ void() SUB_Null2 = {};
 
 #define     VEC_VIEW_OFS  '0 0 32'
 
-// FIXME: Limits Quakespasm to 12 zombies lol
-#ifdef FTE
-
-#define MAX_ZOMB 			24
-
-#else
-
-#define MAX_ZOMB 			12
-
-#endif // FTE 
-
 vector	trace_plane_normal;
 
 //

From 7b0c11586a4453074bb68547c9376d84ce1fb7d1 Mon Sep 17 00:00:00 2001
From: Ian <motolegacy.git@gmail.com>
Date: Mon, 16 Oct 2023 16:00:21 -0400
Subject: [PATCH 2/3] SERVER: Register nzp_maxai builtin

---
 source/server/defs/standard.qc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/server/defs/standard.qc b/source/server/defs/standard.qc
index ecba72d..75865cb 100644
--- a/source/server/defs/standard.qc
+++ b/source/server/defs/standard.qc
@@ -267,6 +267,7 @@ string(float num)
 void    (string trackname)                                                                    	songegg             = #500;
 void    ()                                                                                   	nzp_maxammo         = #501;
 void    (entity who)                                                                            grenade_pulse       = #502;
+float   ()                                                                                      nzp_maxai           = #503;
 
 //
 // constants

From 979611e9e14b4e2ddb9b3e590fa9f28628cf0b68 Mon Sep 17 00:00:00 2001
From: cypress <motolegacy@proton.me>
Date: Mon, 16 Oct 2023 18:09:49 -0400
Subject: [PATCH 3/3] CLIENT: Prevent crosshair when zoom is 1

---
 source/client/hud.qc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/client/hud.qc b/source/client/hud.qc
index 6de907c..e8b8ea8 100644
--- a/source/client/hud.qc
+++ b/source/client/hud.qc
@@ -1156,7 +1156,7 @@ void() Draw_Crosshair =
 	}
 
 	float crosshair_value = cvar("crosshair");
-	if (!crosshair_value)
+	if (!crosshair_value || getstatf(STAT_WEAPONZOOM) == 1)
 		return;
 
 	if (!crosshair_opacity)