Add missing video capture ifdefs

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index eb7a4dd923517688357fb72500d0ff00cd11124f..924d017cef0c8fbaa8d1540e804f68a78c8e460a 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -227,6 +227,7 @@ trace_t CL_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
        // list of entities to test for collisions
        int numtouchedicts;
        static prvm_edict_t *touchedicts[MAX_EDICTS];
+       int clipgroup;
 
        if (hitnetworkentity)
                *hitnetworkentity = 0;
@@ -248,7 +249,7 @@ trace_t CL_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
 
        if (type == MOVE_MISSILE)
        {
-               // LordHavoc: modified this, was = -15, now -= 15
+               // LadyHavoc: modified this, was = -15, now -= 15
                for (i = 0;i < 3;i++)
                {
                        clipmins2[i] -= 15;
@@ -280,6 +281,8 @@ trace_t CL_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
        // precalculate passedict's owner edict pointer for comparisons
        traceowner = passedict ? PRVM_PROG_TO_EDICT(PRVM_clientedictedict(passedict, owner)) : NULL;
 
+       clipgroup = passedict ? (int)PRVM_clientedictfloat(passedict, clipgroup) : 0;
+
        // collide against network entities
        if (hitnetworkbrushmodels)
        {
@@ -381,6 +384,9 @@ skipnetworkplayers:
                        // don't clip owner against owned entities
                        if (passedictprog == PRVM_clientedictedict(touch, owner))
                                continue;
+                       // don't clip against any entities in the same clipgroup (DP_RM_CLIPGROUP)
+                       if (clipgroup && clipgroup == (int)PRVM_clientedictfloat(touch, clipgroup))
+                               continue;
                        // don't clip points against points (they can't collide)
                        if (VectorCompare(PRVM_clientedictvector(touch, mins), PRVM_clientedictvector(touch, maxs)) && (type != MOVE_MISSILE || !((int)PRVM_clientedictfloat(touch, flags) & FL_MONSTER)))
                                continue;
@@ -442,6 +448,7 @@ trace_t CL_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
        // list of entities to test for collisions
        int numtouchedicts;
        static prvm_edict_t *touchedicts[MAX_EDICTS];
+       int clipgroup;
        if (VectorCompare(start, end))
                return CL_TracePoint(start, type, passedict, hitsupercontentsmask, skipsupercontentsmask, skipmaterialflagsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
 
@@ -466,7 +473,7 @@ trace_t CL_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
 
        if (type == MOVE_MISSILE)
        {
-               // LordHavoc: modified this, was = -15, now -= 15
+               // LadyHavoc: modified this, was = -15, now -= 15
                for (i = 0;i < 3;i++)
                {
                        clipmins2[i] -= 15;
@@ -498,6 +505,8 @@ trace_t CL_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
        // precalculate passedict's owner edict pointer for comparisons
        traceowner = passedict ? PRVM_PROG_TO_EDICT(PRVM_clientedictedict(passedict, owner)) : NULL;
 
+       clipgroup = passedict ? (int)PRVM_clientedictfloat(passedict, clipgroup) : 0;
+
        // collide against network entities
        if (hitnetworkbrushmodels)
        {
@@ -599,6 +608,9 @@ skipnetworkplayers:
                        // don't clip owner against owned entities
                        if (passedictprog == PRVM_clientedictedict(touch, owner))
                                continue;
+                       // don't clip against any entities in the same clipgroup (DP_RM_CLIPGROUP)
+                       if (clipgroup && clipgroup == (int)PRVM_clientedictfloat(touch, clipgroup))
+                               continue;
                        // don't clip points against points (they can't collide)
                        if (VectorCompare(PRVM_clientedictvector(touch, mins), PRVM_clientedictvector(touch, maxs)) && (type != MOVE_MISSILE || !((int)PRVM_clientedictfloat(touch, flags) & FL_MONSTER)))
                                continue;
@@ -664,6 +676,7 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
        // list of entities to test for collisions
        int numtouchedicts;
        static prvm_edict_t *touchedicts[MAX_EDICTS];
+       int clipgroup;
        if (VectorCompare(mins, maxs))
        {
                vec3_t shiftstart, shiftend;
@@ -700,7 +713,7 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
 
        if (type == MOVE_MISSILE)
        {
-               // LordHavoc: modified this, was = -15, now -= 15
+               // LadyHavoc: modified this, was = -15, now -= 15
                for (i = 0;i < 3;i++)
                {
                        clipmins2[i] -= 15;
@@ -743,6 +756,8 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
        // precalculate passedict's owner edict pointer for comparisons
        traceowner = passedict ? PRVM_PROG_TO_EDICT(PRVM_clientedictedict(passedict, owner)) : NULL;
 
+       clipgroup = passedict ? (int)PRVM_clientedictfloat(passedict, clipgroup) : 0;
+
        // collide against network entities
        if (hitnetworkbrushmodels)
        {
@@ -844,6 +859,9 @@ skipnetworkplayers:
                        // don't clip owner against owned entities
                        if (passedictprog == PRVM_clientedictedict(touch, owner))
                                continue;
+                       // don't clip against any entities in the same clipgroup (DP_RM_CLIPGROUP)
+                       if (clipgroup && clipgroup == (int)PRVM_clientedictfloat(touch, clipgroup))
+                               continue;
                        // don't clip points against points (they can't collide)
                        if (pointtrace && VectorCompare(PRVM_clientedictvector(touch, mins), PRVM_clientedictvector(touch, maxs)) && (type != MOVE_MISSILE || !((int)PRVM_clientedictfloat(touch, flags) & FL_MONSTER)))
                                continue;