From: havoc Date: Sun, 14 Aug 2005 16:36:09 +0000 (+0000) Subject: added a comment in push code X-Git-Tag: xonotic-v0.1.0preview~4652 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b01d973583201f2b57613d2233572fba9d33f74a;p=xonotic%2Fdarkplaces.git added a comment in push code git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5574 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/sv_phys.c b/sv_phys.c index 0e37ed3b..555aa44b 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -657,8 +657,11 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime) // if the entity is standing on the pusher, it will definitely be moved if (!(((int)check->fields.server->flags & FL_ONGROUND) && PRVM_PROG_TO_EDICT(check->fields.server->groundentity) == pusher)) + { + // if the entity is not inside the pusher's final position, leave it alone if (!SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin).startsolid) continue; + } if (forward[0] != 1 || left[1] != 1) // quick way to check if any rotation is used {