]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Q1BSP: Fix TraceBox failing to move a bbox out of solid
authorbones_was_here <bones_was_here@xonotic.au>
Sat, 15 Jul 2023 12:28:32 +0000 (22:28 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Sat, 15 Jul 2023 12:28:32 +0000 (22:28 +1000)
Fixes https://github.com/DarkPlacesEngine/darkplaces/issues/85

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

index 4fbf53b5583fbc08fe043affefeb9bb2bd4c738e..e03c2b58a40e1f55937c89641511b0ef2842272c 100644 (file)
@@ -762,7 +762,7 @@ static int Mod_Q1BSP_RecursiveHullCheck(RecursiveHullCheckTraceInfo_t *t, int nu
                        // recurse both sides, front side first
                        ret = Mod_Q1BSP_RecursiveHullCheck(t, node->children[p1side], p1f, midf, p1, mid);
                        // if this side is not empty, return what it is (solid or done)
-                       if (ret != HULLCHECKSTATE_EMPTY)
+                       if (ret != HULLCHECKSTATE_EMPTY && !t->trace->allsolid)
                                return ret;
 
                        ret = Mod_Q1BSP_RecursiveHullCheck(t, node->children[p2side], midf, p2f, mid, p2);