From: bones_was_here <bones_was_here@xonotic.au>
Date: Fri, 21 Jul 2023 08:28:04 +0000 (+1000)
Subject: Add cvar mod_q1bsp_zero_hullsize_cutoff for games using "big" projectiles on Q1BSP
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0dfd32e1e2bb2c1bd5e58b3202271c391be423de;p=xonotic%2Fdarkplaces.git

Add cvar mod_q1bsp_zero_hullsize_cutoff for games using "big" projectiles on Q1BSP

Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
---

diff --git a/cmd.c b/cmd.c
index c9b2cd5d..0fd60018 100644
--- a/cmd.c
+++ b/cmd.c
@@ -804,6 +804,7 @@ static void Cmd_Exec(cmd_state_t *cmd, const char *filename)
 "csqc_polygons_defaultmaterial_nocullface 1\n"
 "con_chatsound_team_mask 13\n"
 "sv_gameplayfix_customstats 1\n"
+"mod_q1bsp_zero_hullsize_cutoff 8.03125\n"
 				);
 			break;
 		// Steel Storm: Burning Retribution csqc misinterprets CSQC_InputEvent if type is a value other than 0 or 1
diff --git a/model_brush.c b/model_brush.c
index bfed5571..8d22e70c 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -65,6 +65,7 @@ cvar_t mod_q3shader_force_addalpha = {CF_CLIENT, "mod_q3shader_force_addalpha",
 cvar_t mod_q3shader_force_terrain_alphaflag = {CF_CLIENT, "mod_q3shader_force_terrain_alphaflag", "0", "for multilayered terrain shaders force TEXF_ALPHA flag on both layers"};
 
 cvar_t mod_q1bsp_polygoncollisions = {CF_CLIENT | CF_SERVER, "mod_q1bsp_polygoncollisions", "0", "disables use of precomputed cliphulls and instead collides with polygons (uses Bounding Interval Hierarchy optimizations)"};
+cvar_t mod_q1bsp_zero_hullsize_cutoff = {CF_CLIENT | CF_SERVER, "mod_q1bsp_zero_hullsize_cutoff", "3", "bboxes with an X dimension smaller than this will use the smallest cliphull (0x0x0) instead of being rounded up to the player's cliphull (32x32x56)"};
 cvar_t mod_recalculatenodeboxes = {CF_CLIENT | CF_SERVER, "mod_recalculatenodeboxes", "1", "enables use of generated node bounding boxes based on BSP tree portal reconstruction, rather than the node boxes supplied by the map compiler"};
 
 static texture_t mod_q1bsp_texture_solid;
@@ -115,6 +116,7 @@ void Mod_BrushInit(void)
 	Cvar_RegisterVariable(&mod_q3shader_force_addalpha);
 	Cvar_RegisterVariable(&mod_q3shader_force_terrain_alphaflag);
 	Cvar_RegisterVariable(&mod_q1bsp_polygoncollisions);
+	Cvar_RegisterVariable(&mod_q1bsp_zero_hullsize_cutoff);
 	Cvar_RegisterVariable(&mod_recalculatenodeboxes);
 
 	// these games were made for older DP engines and are no longer
@@ -976,7 +978,7 @@ static void Mod_Q1BSP_TraceBox(struct model_s *model, const frameblend_t *frameb
 	rhc.trace->fraction = 1;
 	rhc.trace->allsolid = true;
 	VectorSubtract(boxmaxs, boxmins, boxsize);
-	if (boxsize[0] < 3)
+	if (boxsize[0] < mod_q1bsp_zero_hullsize_cutoff.value)
 		rhc.hull = &model->brushq1.hulls[0]; // 0x0x0
 	else if (model->brush.ishlbsp)
 	{
@@ -3828,7 +3830,7 @@ static void Mod_Q1BSP_RoundUpToHullSize(model_t *cmodel, const vec3_t inmins, co
 	VectorSubtract(inmaxs, inmins, size);
 	if (cmodel->brush.ishlbsp)
 	{
-		if (size[0] < 3)
+		if (size[0] < mod_q1bsp_zero_hullsize_cutoff.value)
 			hull = &cmodel->brushq1.hulls[0]; // 0x0x0
 		else if (size[0] <= 32)
 		{