From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 31 Oct 2011 06:52:07 +0000 (+0000)
Subject: fix dpmod shell casings spinning on the floor by disabling the
X-Git-Tag: xonotic-v0.6.0~209
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e84f9efeee29063c4a8bbc3830bb641b1a321503;p=xonotic%2Fdarkplaces.git

fix dpmod shell casings spinning on the floor by disabling the
velocity-change-is-a-teleport logic in SV_PushEntity

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11494 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=3c0cb1c10dcd023d633ef18a24d458d7a3bdc1de
---

diff --git a/sv_phys.c b/sv_phys.c
index d55bf751..db9b4fa0 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1659,7 +1659,7 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q
 	if((PRVM_serveredictfloat(ent, solid) >= SOLID_TRIGGER && trace->ent && (!((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND) || PRVM_serveredictedict(ent, groundentity) != PRVM_EDICT_TO_PROG(trace->ent))))
 		SV_Impact (ent, trace);
 
-	return VectorCompare(PRVM_serveredictvector(ent, origin), original) && VectorCompare(PRVM_serveredictvector(ent, velocity), original_velocity);
+	return VectorCompare(PRVM_serveredictvector(ent, origin), original);// && VectorCompare(PRVM_serveredictvector(ent, velocity), original_velocity);
 }