reverted dresk's DP_SV_ALLOWTOUCHWITHOWNER patch as it adds unnecessary

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 6c2d933b6660540ac84a916dc09a8abb2ccea8bb..2948f2c9210e640aed513ed7c21525ac59be9fd8 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -146,9 +146,6 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
        int numtouchedicts;
        prvm_edict_t *touchedicts[MAX_EDICTS];
 
-       // Get Allow Touch with Owner
-       int nAllowTouchWithOwner = PRVM_EDICTFIELDVALUE(passedict, prog->fieldoffsets.allowtouchwithowner)->_int;
-
        VectorCopy(start, clipstart);
        VectorCopy(end, clipend);
        VectorCopy(mins, clipmins);
@@ -235,10 +232,10 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
                        if (passedict == touch)
                                continue;
                        // don't clip owned entities against owner
-                       if (!nAllowTouchWithOwner && traceowner == touch)
+                       if (traceowner == touch)
                                continue;
                        // don't clip owner against owned entities
-                       if (!nAllowTouchWithOwner && passedictprog == touch->fields.server->owner)
+                       if (passedictprog == touch->fields.server->owner)
                                continue;
                        // don't clip points against points (they can't collide)
                        if (pointtrace && VectorCompare(touch->fields.server->mins, touch->fields.server->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.server->flags & FL_MONSTER)))