Use MOVE_NOMONSTERS to ensure the entity is only testing against platforms

diff --git a/qcsrc/common/physics/movetypes/push.qc b/qcsrc/common/physics/movetypes/push.qc
index 3df79a0380e2dcfbba1c0d62bfba935831332642..9179ec4a2fc31085aec1c5096b056fe58d590937 100644 (file)
--- a/qcsrc/common/physics/movetypes/push.qc
+++ b/qcsrc/common/physics/movetypes/push.qc
@@ -93,7 +93,7 @@ void _Movetype_PushMove(entity this, float dt) // SV_PushMove
                // final position, move it
                if (!IS_ONGROUND(check) || check.groundentity != this)
                {
-                       tracebox(check.origin, check.mins, check.maxs, check.origin, MOVE_NORMAL, check);
+                       tracebox(check.origin, check.mins, check.maxs, check.origin, MOVE_NOMONSTERS, check);
                        if(!trace_startsolid)
                                continue;
                }
@@ -148,7 +148,7 @@ void _Movetype_PushMove(entity this, float dt) // SV_PushMove
                        UNSET_ONGROUND(check);
 
                // if it is still inside the pusher, block
-               tracebox(check.origin, check.mins, check.maxs, check.origin, MOVE_HITMODEL, check);
+               tracebox(check.origin, check.mins, check.maxs, check.origin, MOVE_NOMONSTERS, check);
                if(trace_startsolid)
                {
                        if(_Movetype_NudgeOutOfSolid_PivotIsKnownGood(check, pivot))

diff --git a/qcsrc/common/physics/movetypes/push.qh b/qcsrc/common/physics/movetypes/push.qh
index 442386085a2ad3fbbcd8a4861259be644cb86f27..f33e76191cf0104db2cc20ca2a18b095914c8a59 100644 (file)
--- a/qcsrc/common/physics/movetypes/push.qh
+++ b/qcsrc/common/physics/movetypes/push.qh
@@ -9,6 +9,4 @@ STATIC_INIT(g_pushmove_moved) { g_pushmove_moved = IL_NEW(); }
 
 #ifdef CSQC
 .float ltime;
-
-const int MOVE_HITMODEL = 4;
 #endif