eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

I'm just going to remove that hack. It doesn't work anyway, and there's now a better method (trace_endcontents).

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1954 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-02-11 18:18:55 +00:00
parent e3537af35d
commit 781e8ee38f
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
engine/common/gl_q2bsp.c
View file

@ -4516,7 +4516,6 @@ void CM_TestBoxInBrush (vec3_t mins, vec3_t maxs, vec3_t p1,
vec3_t ofs; vec3_t ofs;
float d1; float d1;
q2cbrushside_t *side; q2cbrushside_t *side;
qboolean issky = false;
if (!brush->numsides) if (!brush->numsides)
return; return;
@ -4545,25 +4544,15 @@ void CM_TestBoxInBrush (vec3_t mins, vec3_t maxs, vec3_t p1,
d1 = DotProduct (p1, plane->normal) - dist; 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 completely in front of face, no intersection
if (d1 > 0) if (d1 > 0)
return; return;
} }
// inside this brush // inside this brush
trace->startsolid = trace->allsolid = true; trace->startsolid = trace->allsolid = true;
trace->fraction = 0; trace->fraction = 0;
if (issky) trace->contents |= brush->contents;
trace->contents |= FTECONTENTS_SKY;
else
trace->contents |= brush->contents;
} }
void CM_TestBoxInPatch (vec3_t mins, vec3_t maxs, vec3_t p1, 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) void CMQ3_SetAreaPortalState (int area1, int area2, qboolean open)
{ {
if (!mapisq3) if (!mapisq3)
Host_Error ("CMQ3_SetAreaPortalState on non-q3 map"); return;
// Host_Error ("CMQ3_SetAreaPortalState on non-q3 map");
if (area1 > numareas || area2 > numareas) if (area1 > numareas || area2 > numareas)
Host_Error ("CMQ3_SetAreaPortalState: area > numareas"); Host_Error ("CMQ3_SetAreaPortalState: area > numareas");