From 781e8ee38fdb7674204c10c9678d5b5d1712aa8e Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 11 Feb 2006 18:18:55 +0000 Subject: [PATCH] I'm just going to remove that hack. It doesn't work anyway, and there's now a better method (trace_endcontents). git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1954 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/gl_q2bsp.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/engine/common/gl_q2bsp.c b/engine/common/gl_q2bsp.c index 1cd474fa7..b66c37883 100644 --- a/engine/common/gl_q2bsp.c +++ b/engine/common/gl_q2bsp.c @@ -4516,7 +4516,6 @@ void CM_TestBoxInBrush (vec3_t mins, vec3_t maxs, vec3_t p1, vec3_t ofs; float d1; q2cbrushside_t *side; - qboolean issky = false; if (!brush->numsides) return; @@ -4545,25 +4544,15 @@ void CM_TestBoxInBrush (vec3_t mins, vec3_t maxs, vec3_t p1, d1 = DotProduct (p1, plane->normal) - dist; - if (side->surface->c.flags & 4) - { - issky = true; - d1 -= DIST_EPSILON*2; - } - // if completely in front of face, no intersection if (d1 > 0) return; - } // inside this brush trace->startsolid = trace->allsolid = true; trace->fraction = 0; - if (issky) - trace->contents |= FTECONTENTS_SKY; - else - trace->contents |= brush->contents; + trace->contents |= brush->contents; } void CM_TestBoxInPatch (vec3_t mins, vec3_t maxs, vec3_t p1, @@ -5358,7 +5347,8 @@ void VARGS CMQ2_SetAreaPortalState (int portalnum, qboolean open) void CMQ3_SetAreaPortalState (int area1, int area2, qboolean open) { if (!mapisq3) - Host_Error ("CMQ3_SetAreaPortalState on non-q3 map"); + return; +// Host_Error ("CMQ3_SetAreaPortalState on non-q3 map"); if (area1 > numareas || area2 > numareas) Host_Error ("CMQ3_SetAreaPortalState: area > numareas");