From 056b0de3110de03acd8113e41145a914cdc7b90f Mon Sep 17 00:00:00 2001 From: divverent Date: Sat, 5 Dec 2009 19:04:20 +0000 Subject: [PATCH] fix endposnudge git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9540 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_collision.c | 6 +++--- sv_phys.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cl_collision.c b/cl_collision.c index 95930938..0ae9f27a 100644 --- a/cl_collision.c +++ b/cl_collision.c @@ -73,7 +73,7 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve Collision_ClipTrace_Box(&trace, ent->model->normalmins, ent->model->normalmaxs, starttransformed, vec3_origin, vec3_origin, endtransformed, SUPERCONTENTS_SOLID, SUPERCONTENTS_SOLID, 0, NULL); #ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0) - Collision_ShortenTrace(&trace, len / (len + 1), pEnd); + Collision_ShortenTrace(&trace, len / (len + collision_endposnudge.value), pEnd); #endif if (maxrealfrac < trace.realfraction) continue; @@ -658,7 +658,7 @@ skipnetworkplayers: finished: #ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0) - Collision_ShortenTrace(&cliptrace, len / (len + 1), pEnd); + Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd); #endif return cliptrace; } @@ -919,7 +919,7 @@ skipnetworkplayers: finished: #ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0) - Collision_ShortenTrace(&cliptrace, len / (len + 1), pEnd); + Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd); #endif return cliptrace; } diff --git a/sv_phys.c b/sv_phys.c index 75b7942d..de66811a 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -398,7 +398,7 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ finished: #ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0) - Collision_ShortenTrace(&cliptrace, len / (len + 1), pEnd); + Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd); #endif return cliptrace; } @@ -598,7 +598,7 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co finished: #ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0) - Collision_ShortenTrace(&cliptrace, len / (len + 1), pEnd); + Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd); #endif return cliptrace; } -- 2.39.2