got rid of leafnums array in edict structure for pvs checking, pvs is now checked...

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 0519bd85e0f6a80961fc7417ee8264e2a18b020a..fc2f38a4e6c1429b5d7252f23da2c83b8ac26d0e 100644 (file)
--- a/world.c
+++ b/world.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

 
 See the GNU General Public License for more details.
 
 
 See the GNU General Public License for more details.
 


@@ -29,6 +29,55 @@ line of sight checks trace->crosscontent, but bullets don't
 
 */
 
 
 */
 

+/*
+typedef struct link_s
+{
+       struct link_s   *prev, *next;
+} link_t;
+*/
+
+
+void ClearLink (link_t *l);
+void RemoveLink (link_t *l);
+void InsertLinkBefore (link_t *l, link_t *before);
+void InsertLinkAfter (link_t *l, link_t *after);
+
+// (type *)STRUCT_FROM_LINK(link_t *link, type, member)
+// ent = STRUCT_FROM_LINK(link,entity_t,order)
+// FIXME: remove this mess!
+//#define      STRUCT_FROM_LINK(l,t,m) ((t *)((byte *)l - (int)&(((t *)0)->m)))
+
+#define        EDICT_FROM_AREA(l) ((edict_t *)((byte *)l - (int)&(((edict_t *)0)->area)))
+
+//============================================================================
+
+// ClearLink is used for new headnodes
+void ClearLink (link_t *l)
+{
+       l->prev = l->next = l;
+}
+
+void RemoveLink (link_t *l)
+{
+       l->next->prev = l->prev;
+       l->prev->next = l->next;
+}
+
+void InsertLinkBefore (link_t *l, link_t *before)
+{
+       l->next = before;
+       l->prev = before->prev;
+       l->prev->next = l;
+       l->next->prev = l;
+}
+void InsertLinkAfter (link_t *l, link_t *after)
+{
+       l->next = after->next;
+       l->prev = after;
+       l->prev->next = l;
+       l->next->prev = l;
+}
+

 
 typedef struct
 {
 
 typedef struct
 {


@@ -124,7 +173,6 @@ Offset is filled in to contain the adjustment that must be added to the
 testing object's origin to get a point to use with the returned hull.
 ================
 */
 testing object's origin to get a point to use with the returned hull.
 ================
 */

-extern qboolean hlbsp;

 hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
 {
        model_t         *model;
 hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
 {
        model_t         *model;


@@ -184,7 +232,7 @@ hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
                VectorSubtract (ent->v.mins, maxs, hullmins);
                VectorSubtract (ent->v.maxs, mins, hullmaxs);
                hull = SV_HullForBox (hullmins, hullmaxs);
                VectorSubtract (ent->v.mins, maxs, hullmins);
                VectorSubtract (ent->v.maxs, mins, hullmaxs);
                hull = SV_HullForBox (hullmins, hullmaxs);

-               
+

                VectorCopy (ent->v.origin, offset);
        }
 
                VectorCopy (ent->v.origin, offset);
        }
 


@@ -232,28 +280,28 @@ areanode_t *SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
 
        ClearLink (&anode->trigger_edicts);
        ClearLink (&anode->solid_edicts);
 
        ClearLink (&anode->trigger_edicts);
        ClearLink (&anode->solid_edicts);

-       
+

        if (depth == AREA_DEPTH)
        {
                anode->axis = -1;
                anode->children[0] = anode->children[1] = NULL;
                return anode;
        }
        if (depth == AREA_DEPTH)
        {
                anode->axis = -1;
                anode->children[0] = anode->children[1] = NULL;
                return anode;
        }

-       
+

        VectorSubtract (maxs, mins, size);
        if (size[0] > size[1])
                anode->axis = 0;
        else
                anode->axis = 1;
        VectorSubtract (maxs, mins, size);
        if (size[0] > size[1])
                anode->axis = 0;
        else
                anode->axis = 1;

-       
+

        anode->dist = 0.5 * (maxs[anode->axis] + mins[anode->axis]);
        anode->dist = 0.5 * (maxs[anode->axis] + mins[anode->axis]);

-       VectorCopy (mins, mins1);       
-       VectorCopy (mins, mins2);       
-       VectorCopy (maxs, maxs1);       
-       VectorCopy (maxs, maxs2);       
-       
+       VectorCopy (mins, mins1);
+       VectorCopy (mins, mins2);
+       VectorCopy (maxs, maxs1);
+       VectorCopy (maxs, maxs2);
+

        maxs1[anode->axis] = mins2[anode->axis] = anode->dist;
        maxs1[anode->axis] = mins2[anode->axis] = anode->dist;

-       
+

        anode->children[0] = SV_CreateAreaNode (depth+1, mins2, maxs2);
        anode->children[1] = SV_CreateAreaNode (depth+1, mins1, maxs1);
 
        anode->children[0] = SV_CreateAreaNode (depth+1, mins2, maxs2);
        anode->children[1] = SV_CreateAreaNode (depth+1, mins1, maxs1);
 


@@ -269,7 +317,7 @@ SV_ClearWorld
 void SV_ClearWorld (void)
 {
        SV_InitBoxHull ();
 void SV_ClearWorld (void)
 {
        SV_InitBoxHull ();

-       
+

        memset (sv_areanodes, 0, sizeof(sv_areanodes));
        sv_numareanodes = 0;
        SV_CreateAreaNode (0, sv.worldmodel->mins, sv.worldmodel->maxs);
        memset (sv_areanodes, 0, sizeof(sv_areanodes));
        sv_numareanodes = 0;
        SV_CreateAreaNode (0, sv.worldmodel->mins, sv.worldmodel->maxs);


@@ -313,11 +361,11 @@ loc0:
                if (!touch->v.touch || touch->v.solid != SOLID_TRIGGER)
                        continue;
                if (ent->v.absmin[0] > touch->v.absmax[0]
                if (!touch->v.touch || touch->v.solid != SOLID_TRIGGER)
                        continue;
                if (ent->v.absmin[0] > touch->v.absmax[0]

-               || ent->v.absmin[1] > touch->v.absmax[1]
-               || ent->v.absmin[2] > touch->v.absmax[2]
-               || ent->v.absmax[0] < touch->v.absmin[0]
-               || ent->v.absmax[1] < touch->v.absmin[1]
-               || ent->v.absmax[2] < touch->v.absmin[2] )
+                || ent->v.absmin[1] > touch->v.absmax[1]
+                || ent->v.absmin[2] > touch->v.absmax[2]
+                || ent->v.absmax[0] < touch->v.absmin[0]
+                || ent->v.absmax[1] < touch->v.absmin[1]
+                || ent->v.absmax[2] < touch->v.absmin[2])

                        continue;
                old_self = pr_global_struct->self;
                old_other = pr_global_struct->other;
                        continue;
                old_self = pr_global_struct->self;
                old_other = pr_global_struct->other;


@@ -325,16 +373,16 @@ loc0:
                pr_global_struct->self = EDICT_TO_PROG(touch);
                pr_global_struct->other = EDICT_TO_PROG(ent);
                pr_global_struct->time = sv.time;
                pr_global_struct->self = EDICT_TO_PROG(touch);
                pr_global_struct->other = EDICT_TO_PROG(ent);
                pr_global_struct->time = sv.time;

-               PR_ExecuteProgram (touch->v.touch);
+               PR_ExecuteProgram (touch->v.touch, "");

 
                pr_global_struct->self = old_self;
                pr_global_struct->other = old_other;
        }
 
                pr_global_struct->self = old_self;
                pr_global_struct->other = old_other;
        }

-       
+

 // recurse down both sides
        if (node->axis == -1)
                return;
 // recurse down both sides
        if (node->axis == -1)
                return;

-       
+

        // LordHavoc: optimized recursion
 //     if (ent->v.absmax[node->axis] > node->dist) SV_TouchLinks (ent, node->children[0]);
 //     if (ent->v.absmin[node->axis] < node->dist) SV_TouchLinks (ent, node->children[1]);
        // LordHavoc: optimized recursion
 //     if (ent->v.absmax[node->axis] > node->dist) SV_TouchLinks (ent, node->children[0]);
 //     if (ent->v.absmin[node->axis] < node->dist) SV_TouchLinks (ent, node->children[1]);


@@ -356,63 +404,6 @@ loc0:
 }
 
 
 }
 
 

-/*
-===============
-SV_FindTouchedLeafs
-
-===============
-*/
-void SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
-{
-       mplane_t        *splitplane;
-       mleaf_t         *leaf;
-       int                     sides;
-       int                     leafnum;
-
-loc0:
-       if (node->contents == CONTENTS_SOLID)
-               return;
-       
-// add an efrag if the node is a leaf
-
-       if ( node->contents < 0)
-       {
-               if (ent->num_leafs == MAX_ENT_LEAFS)
-                       return;
-
-               leaf = (mleaf_t *)node;
-               leafnum = leaf - sv.worldmodel->leafs - 1;
-
-               ent->leafnums[ent->num_leafs] = leafnum;
-               ent->num_leafs++;                       
-               return;
-       }
-       
-// NODE_MIXED
-
-       splitplane = node->plane;
-       sides = BOX_ON_PLANE_SIDE(ent->v.absmin, ent->v.absmax, splitplane);
-       
-// recurse down the contacted sides
-       // LordHavoc: optimized recursion
-//     if (sides & 1) SV_FindTouchedLeafs (ent, node->children[0]);
-//     if (sides & 2) SV_FindTouchedLeafs (ent, node->children[1]);
-       switch (sides)
-       {
-       case 1:
-               node = node->children[0];
-               goto loc0;
-       case 2:
-               node = node->children[1];
-               goto loc0;
-       default: // 3
-               if (node->children[0]->contents != CONTENTS_SOLID)
-                       SV_FindTouchedLeafs (ent, node->children[0]);
-               node = node->children[1];
-               goto loc0;
-       }
-}
-

 /*
 ===============
 SV_LinkEdict
 /*
 ===============
 SV_LinkEdict


@@ -435,21 +426,29 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
 // set the abs box
 
 // LordHavoc: enabling rotating bmodels
 // set the abs box
 
 // LordHavoc: enabling rotating bmodels

-       if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]) )
-       {       // expand for rotation
+       if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
+       {
+               // expand for rotation

                float           max, v;
                int                     i;
 
                float           max, v;
                int                     i;
 

+               max = DotProduct(ent->v.mins, ent->v.mins);
+               v = DotProduct(ent->v.maxs, ent->v.maxs);
+               if (max < v)
+                       max = v;
+               max = sqrt(max);
+               /*

                max = 0;
                for (i=0 ; i<3 ; i++)
                {
                max = 0;
                for (i=0 ; i<3 ; i++)
                {

-                       v =fabs( ent->v.mins[i]);
-                       if (v > max)
+                       v = fabs(ent->v.mins[i]);
+                       if (max < v)

                                max = v;
                                max = v;

-                       v =fabs( ent->v.maxs[i]);
-                       if (v > max)
+                       v = fabs(ent->v.maxs[i]);
+                       if (max < v)

                                max = v;
                }
                                max = v;
                }

+               */

                for (i=0 ; i<3 ; i++)
                {
                        ent->v.absmin[i] = ent->v.origin[i] - max;
                for (i=0 ; i<3 ; i++)
                {
                        ent->v.absmin[i] = ent->v.origin[i] - max;


@@ -458,7 +457,7 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
        }
        else
        {
        }
        else
        {

-               VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin);  
+               VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin);

                VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax);
        }
 
                VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax);
        }
 


@@ -474,7 +473,8 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
                ent->v.absmax[1] += 15;
        }
        else
                ent->v.absmax[1] += 15;
        }
        else

-       {       // because movement is clipped an epsilon away from an actual edge,
+       {
+               // because movement is clipped an epsilon away from an actual edge,

                // we must fully check even when bounding boxes don't quite touch
                ent->v.absmin[0] -= 1;
                ent->v.absmin[1] -= 1;
                // we must fully check even when bounding boxes don't quite touch
                ent->v.absmin[0] -= 1;
                ent->v.absmin[1] -= 1;


@@ -483,11 +483,6 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
                ent->v.absmax[1] += 1;
                ent->v.absmax[2] += 1;
        }
                ent->v.absmax[1] += 1;
                ent->v.absmax[2] += 1;
        }

-       
-// link to PVS leafs
-       ent->num_leafs = 0;
-       if (ent->v.modelindex)
-               SV_FindTouchedLeafs (ent, sv.worldmodel->nodes);

 
        if (ent->v.solid == SOLID_NOT)
                return;
 
        if (ent->v.solid == SOLID_NOT)
                return;


@@ -505,14 +500,14 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
                else
                        break;          // crosses the node
        }
                else
                        break;          // crosses the node
        }

-       
-// link it in  
+
+// link it in

 
        if (ent->v.solid == SOLID_TRIGGER)
                InsertLinkBefore (&ent->area, &node->trigger_edicts);
        else
                InsertLinkBefore (&ent->area, &node->solid_edicts);
 
        if (ent->v.solid == SOLID_TRIGGER)
                InsertLinkBefore (&ent->area, &node->trigger_edicts);
        else
                InsertLinkBefore (&ent->area, &node->solid_edicts);

-       
+

 // if touch_triggers, touch all entities at this node and descend for more
        if (touch_triggers)
                SV_TouchLinks ( ent, sv_areanodes );
 // if touch_triggers, touch all entities at this node and descend for more
        if (touch_triggers)
                SV_TouchLinks ( ent, sv_areanodes );


@@ -528,7 +523,19 @@ POINT TESTING IN HULLS
 ===============================================================================
 */
 
 ===============================================================================
 */
 

-// SV_HullPointContents moved to cpu_noasm.c
+/*
+==================
+SV_HullPointContents
+
+==================
+*/
+int SV_HullPointContents (hull_t *hull, int num, vec3_t p)
+{
+       while (num >= 0)
+               num = hull->clipnodes[num].children[(hull->planes[hull->clipnodes[num].planenum].type < 3 ? p[hull->planes[hull->clipnodes[num].planenum].type] : DotProduct (hull->planes[hull->clipnodes[num].planenum].normal, p)) < hull->planes[hull->clipnodes[num].planenum].dist];
+
+       return num;
+}

 
 /*
 ============
 
 /*
 ============


@@ -541,8 +548,8 @@ edict_t     *SV_TestEntityPosition (edict_t *ent)
 {
        trace_t trace;
 
 {
        trace_t trace;
 

-       trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, 0, ent);
-       
+       trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent);
+

        if (trace.startsolid)
                return sv.edicts;
                
        if (trace.startsolid)
                return sv.edicts;
                


@@ -567,6 +574,7 @@ SV_RecursiveHullCheck
 
 ==================
 */
 
 ==================
 */

+/*

 qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace)
 {
        dclipnode_t     *node;
 qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace)
 {
        dclipnode_t     *node;


@@ -652,11 +660,12 @@ loc0:
                return false;
        }
 #endif
                return false;
        }
 #endif

-       
+

        if (SV_HullPointContents (hull, node->children[side^1], mid) != CONTENTS_SOLID)
 // go past the node
                return SV_RecursiveHullCheck (hull, node->children[side^1], midf, p2f, mid, p2, trace);
        // mid would need to be duplicated during recursion...
        if (SV_HullPointContents (hull, node->children[side^1], mid) != CONTENTS_SOLID)
 // go past the node
                return SV_RecursiveHullCheck (hull, node->children[side^1], midf, p2f, mid, p2, trace);
        // mid would need to be duplicated during recursion...

+*/

        /*
        {
                p1f = midf;
        /*
        {
                p1f = midf;


@@ -665,6 +674,7 @@ loc0:
                goto loc0;
        }
        */
                goto loc0;
        }
        */

+/*

 
        if (trace->allsolid)
                return false;           // never got out of the solid area
 
        if (trace->allsolid)
                return false;           // never got out of the solid area


@@ -679,11 +689,131 @@ loc0:
        }
        else
        {
        }
        else
        {

-               // LordHavoc: unrolled vector operation because the compiler can't be sure vec3_origin is 0
-//             VectorSubtract (vec3_origin, plane->normal, trace->plane.normal);
-               trace->plane.normal[0] = -plane->normal[0];
-               trace->plane.normal[1] = -plane->normal[1];
-               trace->plane.normal[2] = -plane->normal[2];
+               VectorNegate (plane->normal, trace->plane.normal);
+               trace->plane.dist = -plane->dist;
+       }
+
+       while (SV_HullPointContents (hull, hull->firstclipnode, mid) == CONTENTS_SOLID)
+       { // shouldn't really happen, but does occasionally
+               frac -= 0.1;
+               if (frac < 0)
+               {
+                       trace->fraction = midf;
+                       VectorCopy (mid, trace->endpos);
+                       Con_DPrintf ("backup past 0\n");
+                       return false;
+               }
+               midf = p1f + (p2f - p1f)*frac;
+               for (i=0 ; i<3 ; i++)
+                       mid[i] = p1[i] + frac*(p2[i] - p1[i]);
+       }
+
+       trace->fraction = midf;
+       VectorCopy (mid, trace->endpos);
+
+       return false;
+}
+*/
+
+// LordHavoc: backported from my optimizations to PM_RecursiveHullCheck in QuakeForge newtree (QW)
+qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace)
+{
+       dclipnode_t     *node;
+       mplane_t        *plane;
+       float           t1, t2;
+       float           frac;
+       int                     i;
+       vec3_t          mid;
+       int                     side;
+       float           midf;
+
+       // LordHavoc: a goto!  everyone flee in terror... :)
+loc0:
+// check for empty
+       if (num < 0)
+       {
+               if (num != CONTENTS_SOLID)
+               {
+                       trace->allsolid = false;
+                       if (num == CONTENTS_EMPTY)
+                               trace->inopen = true;
+                       else
+                               trace->inwater = true;
+               }
+               else
+                       trace->startsolid = true;
+               return true;            // empty
+       }
+
+// find the point distances
+       node = hull->clipnodes + num;
+       plane = hull->planes + node->planenum;
+
+       if (plane->type < 3)
+       {
+               t1 = p1[plane->type] - plane->dist;
+               t2 = p2[plane->type] - plane->dist;
+       }
+       else
+       {
+               t1 = DotProduct (plane->normal, p1) - plane->dist;
+               t2 = DotProduct (plane->normal, p2) - plane->dist;
+       }
+
+       // LordHavoc: recursion optimization
+       if (t1 >= 0 && t2 >= 0)
+       {
+               num = node->children[0];
+               goto loc0;
+       }
+       if (t1 < 0 && t2 < 0)
+       {
+               num = node->children[1];
+               goto loc0;
+       }
+
+// put the crosspoint DIST_EPSILON pixels on the near side
+       side = (t1 < 0);
+       if (side)
+               frac = bound(0, (t1 + DIST_EPSILON) / (t1 - t2), 1);
+       else
+               frac = bound(0, (t1 - DIST_EPSILON) / (t1 - t2), 1);
+               
+       midf = p1f + (p2f - p1f)*frac;
+       for (i=0 ; i<3 ; i++)
+               mid[i] = p1[i] + frac*(p2[i] - p1[i]);
+
+// move up to the node
+       if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) )
+               return false;
+
+#ifdef PARANOID
+       if (SV_HullPointContents (pm_hullmodel, mid, node->children[side]) == CONTENTS_SOLID)
+       {
+               Con_Printf ("mid PointInHullSolid\n");
+               return false;
+       }
+#endif
+
+       // LordHavoc: warning to the clumsy, this recursion can not be optimized because mid would need to be duplicated on a stack
+       if (SV_HullPointContents (hull, node->children[side^1], mid) != CONTENTS_SOLID)
+// go past the node
+               return SV_RecursiveHullCheck (hull, node->children[side^1], midf, p2f, mid, p2, trace);
+       
+       if (trace->allsolid)
+               return false;           // never got out of the solid area
+               
+//==================
+// the other side of the node is solid, this is the impact point
+//==================
+       if (!side)
+       {
+               VectorCopy (plane->normal, trace->plane.normal);
+               trace->plane.dist = plane->dist;
+       }
+       else
+       {
+               VectorNegate (plane->normal, trace->plane.normal);

                trace->plane.dist = -plane->dist;
        }
 
                trace->plane.dist = -plane->dist;
        }
 


@@ -761,17 +891,9 @@ loc0:
                if (node->children[side] == CONTENTS_SOLID)
                        return false;
                return SV_TestLine(hull, node->children[!side], mid, p2);
                if (node->children[side] == CONTENTS_SOLID)
                        return false;
                return SV_TestLine(hull, node->children[!side], mid, p2);

-//             num = node->children[!side];
-//             VectorCopy(mid, p1);
-//             goto loc0;

        }
        else if (SV_TestLine(hull, node->children[side], p1, mid))
        }
        else if (SV_TestLine(hull, node->children[side], p1, mid))

-       {

                return SV_TestLine(hull, node->children[!side], mid, p2);
                return SV_TestLine(hull, node->children[!side], mid, p2);

-//             num = node->children[!side];
-//             VectorCopy(mid, p1);
-//             goto loc0;
-       }

        else
                return false;
 }
        else
                return false;
 }


@@ -806,8 +928,7 @@ trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t max
 
 // LordHavoc: enabling rotating bmodels
        // rotate start and end into the models frame of reference
 
 // LordHavoc: enabling rotating bmodels
        // rotate start and end into the models frame of reference

-       if (ent->v.solid == SOLID_BSP && 
-       (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]) )
+       if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))

        {
                vec3_t  forward, right, up;
                vec3_t  temp;
        {
                vec3_t  forward, right, up;
                vec3_t  temp;


@@ -830,8 +951,7 @@ trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t max
 
 // LordHavoc: enabling rotating bmodels
        // rotate endpos back to world frame of reference
 
 // LordHavoc: enabling rotating bmodels
        // rotate endpos back to world frame of reference

-       if (ent->v.solid == SOLID_BSP && 
-       (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]) )
+       if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))

        {
                vec3_t  a;
                vec3_t  forward, right, up;
        {
                vec3_t  a;
                vec3_t  forward, right, up;


@@ -839,7 +959,7 @@ trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t max
 
                if (trace.fraction != 1)
                {
 
                if (trace.fraction != 1)
                {

-                       VectorSubtract (vec3_origin, ent->v.angles, a);
+                       VectorNegate (ent->v.angles, a);

                        AngleVectors (a, forward, right, up);
 
                        VectorCopy (trace.endpos, temp);
                        AngleVectors (a, forward, right, up);
 
                        VectorCopy (trace.endpos, temp);


@@ -897,14 +1017,14 @@ loc0:
                        continue;
 
                if (clip->boxmins[0] > touch->v.absmax[0]
                        continue;
 
                if (clip->boxmins[0] > touch->v.absmax[0]

-               || clip->boxmins[1] > touch->v.absmax[1]
-               || clip->boxmins[2] > touch->v.absmax[2]
-               || clip->boxmaxs[0] < touch->v.absmin[0]
-               || clip->boxmaxs[1] < touch->v.absmin[1]
-               || clip->boxmaxs[2] < touch->v.absmin[2] )
+                || clip->boxmins[1] > touch->v.absmax[1]
+                || clip->boxmins[2] > touch->v.absmax[2]
+                || clip->boxmaxs[0] < touch->v.absmin[0]
+                || clip->boxmaxs[1] < touch->v.absmin[1]
+                || clip->boxmaxs[2] < touch->v.absmin[2])

                        continue;
 
                        continue;
 

-               if (clip->passedict!=0 && clip->passedict->v.size[0] && !touch->v.size[0])
+               if (clip->passedict != NULL && clip->passedict->v.size[0] && !touch->v.size[0])

                        continue;       // points never interact
 
        // might intersect, so do an exact clip
                        continue;       // points never interact
 
        // might intersect, so do an exact clip


@@ -927,8 +1047,7 @@ loc0:
                        trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2, clip->maxs2, clip->end);
                else
                        trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs, clip->end);
                        trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2, clip->maxs2, clip->end);
                else
                        trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs, clip->end);

-               if (trace.allsolid || trace.startsolid ||
-               trace.fraction < clip->trace.fraction)
+               if (trace.allsolid || trace.startsolid || trace.fraction < clip->trace.fraction)

                {
                        trace.ent = touch;
                        if (clip->trace.startsolid)
                {
                        trace.ent = touch;
                        if (clip->trace.startsolid)


@@ -942,7 +1061,7 @@ loc0:
                else if (trace.startsolid)
                        clip->trace.startsolid = true;
        }
                else if (trace.startsolid)
                        clip->trace.startsolid = true;
        }

-       
+

 // recurse down both sides
        if (node->axis == -1)
                return;
 // recurse down both sides
        if (node->axis == -1)
                return;