tenebrae/tenebrae2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bug with monster collisions

Browse source
This commit is contained in:
cholleme 2003-06-25 09:18:55 +00:00
parent 085c765c1e
commit 274614964f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sv_q3support.c
View file

@ -56,7 +56,7 @@ void CM_InitBoxHull (model_t *M)
box_brush = &M->brushes[M->numbrushes]; box_brush = &M->brushes[M->numbrushes];
box_brush->numsides = 6; box_brush->numsides = 6;
box_brush->firstbrushside = M->numbrushsides; box_brush->firstbrushside = M->numbrushsides;
box_brush->contents = CONTENTS_EMPTY; box_brush->contents = CONTENTS_SOLID;
for (i=0 ; i<6 ; i++) for (i=0 ; i<6 ; i++)
{ {
@ -453,6 +453,10 @@ void CM_ClipBoxToBrush (model_t *M, vec3_t mins, vec3_t maxs, vec3_t p1, vec3_t
trace->allsolid = true; trace->allsolid = true;
return; return;
} }
/*if (getout || startout)*/ trace->inopen = true;
if (enterfrac < leavefrac) if (enterfrac < leavefrac)
{ {
if (enterfrac > -1 && enterfrac < trace->fraction) if (enterfrac > -1 && enterfrac < trace->fraction)
@ -512,8 +516,10 @@ void CM_TestBoxInBrush (model_t *M, vec3_t mins, vec3_t maxs, vec3_t p1,
d1 = DotProduct (p1, plane->normal) - dist; d1 = DotProduct (p1, plane->normal) - dist;
// if completely in front of face, no intersection // if completely in front of face, no intersection
if (d1 > 0) if (d1 > 0) {
trace->inopen = true;
return; return;
}
} }
@ -591,7 +597,6 @@ void CM_TraceToBrushModel (model_t *M, int firstbrush, int numbrushes, vec3_t mi
//Con_Printf("CM_TraceToBrushModel"); //Con_Printf("CM_TraceToBrushModel");
if (!M->numnodes) // map not loaded if (!M->numnodes) // map not loaded
return; return;
trace_contents = brushmask; trace_contents = brushmask;