fixed a stupid bug in SV_PushMove that made it ignore the first entity in the move box

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 8d2dfb07010db8a76d41a17ef2ef8d051ac7057d..fa0101f3dfe59ab7a0b5817530b0c95f6140bb92 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -677,7 +677,7 @@ void SV_PushMove (edict_t *pusher, float movetime)
        num_moved = 0;
 
        numcheckentities = SV_EntitiesInBox(mins, maxs, MAX_EDICTS, checkentities);
-       for (e = 1;e < numcheckentities;e++)
+       for (e = 0;e < numcheckentities;e++)
        {
                check = checkentities[e];
                if (check->v->movetype == MOVETYPE_PUSH
@@ -692,7 +692,7 @@ void SV_PushMove (edict_t *pusher, float movetime)
                        if (!SV_ClipMoveToEntity(pusher, check->v->origin, check->v->mins, check->v->maxs, check->v->origin).startsolid)
                                continue;
 
-               if (forward[0] != 1) // quick way to check if any rotation is used
+               if (forward[0] != 1 || left[1] != 1) // quick way to check if any rotation is used
                {
                        VectorSubtract (check->v->origin, pusher->v->origin, org);
                        org2[0] = DotProduct (org, forward);