From 574a8ab4e454ac166a1bd75421fcc1e7f0d2b9cc Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 2 Jun 2020 05:28:51 +1000 Subject: [PATCH] Use MOVE_NOMONSTERS to ensure the entity is only testing against platforms --- qcsrc/common/physics/movetypes/push.qc | 4 ++-- qcsrc/common/physics/movetypes/push.qh | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/physics/movetypes/push.qc b/qcsrc/common/physics/movetypes/push.qc index 3df79a038..9179ec4a2 100644 --- 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 442386085..f33e76191 100644 --- 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 -- 2.39.2