Try to mimic vanilla's allsolid behaviour a bit better, for rogue's l…

…avamen. # Conflicts: # Quake/world.c
Novum · Mar 27, 2022 · 3007dc8 · 3007dc8 · temx · Mar 27, 2022
1 parent 5caae12
commit 3007dc8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Quake/world.c b/Quake/world.c
@@ -647,7 +647,6 @@ static int Q1BSP_RecursiveHullTrace (struct rhtctx_s *ctx, int num, float p1f, f
 		}
 		else
 		{
-			trace->allsolid = false;
 			if (num == CONTENTS_EMPTY)
 				trace->inopen = true;
 			else if (num != CONTENTS_SOLID)
@@ -710,6 +709,7 @@ static int Q1BSP_RecursiveHullTrace (struct rhtctx_s *ctx, int num, float p1f, f
 	rht = Q1BSP_RecursiveHullTrace (ctx, node->children[side], p1f, midf, p1, mid, trace);
 	if (rht != rht_empty && !trace->allsolid)
 		return rht;
+	trace->allsolid = false;
 	rht = Q1BSP_RecursiveHullTrace (ctx, node->children[side ^ 1], midf, p2f, mid, p2, trace);
 	if (rht != rht_solid)
 		return rht;
@@ -900,13 +900,17 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, vec3_t p1, vec3_t p2, trace_t *tra
 	}
 	else
 	{
+		qboolean        ret;
 		struct rhtctx_s ctx;
 		VectorCopy (p1, ctx.start);
 		VectorCopy (p2, ctx.end);
 		ctx.clipnodes = hull->clipnodes;
 		ctx.planes = hull->planes;
 		ctx.hitcontents = hitcontents;
-		return Q1BSP_RecursiveHullTrace (&ctx, hull->firstclipnode, 0, 1, p1, p2, trace) != rht_impact;
+		ret = Q1BSP_RecursiveHullTrace (&ctx, hull->firstclipnode, 0, 1, p1, p2, trace) != rht_impact;
+		if (!trace->startsolid)
+			trace->allsolid = false;
+		return ret;
 	}
 }