Merge branch 'main' of https://github.com/nzp-team/quakec

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)

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++;

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;
 
 //

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