From 55ed12f8d1eb6887d348be03aee5573d44177ffb Mon Sep 17 00:00:00 2001 From: Michael Sartain Date: Thu, 2 Oct 2014 08:25:55 -0700 Subject: Updated the SDK with the latest code from the TF and HL2 branches. --- mp/src/game/server/triggers.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mp/src/game/server/triggers.cpp') diff --git a/mp/src/game/server/triggers.cpp b/mp/src/game/server/triggers.cpp index 295e826a..742976fb 100644 --- a/mp/src/game/server/triggers.cpp +++ b/mp/src/game/server/triggers.cpp @@ -33,6 +33,7 @@ #include "ai_behavior_follow.h" #include "ai_behavior_lead.h" #include "gameinterface.h" +#include "ilagcompensationmanager.h" #ifdef HL2_DLL #include "hl2_player.h" @@ -2269,7 +2270,7 @@ void CTriggerPush::Touch( CBaseEntity *pOther ) #endif Vector vecPush = (m_flPushSpeed * vecAbsDir); - if ( pOther->GetFlags() & FL_BASEVELOCITY ) + if ( ( pOther->GetFlags() & FL_BASEVELOCITY ) && !lagcompensation->IsCurrentlyDoingLagCompensation() ) { vecPush = vecPush + pOther->GetBaseVelocity(); } -- cgit v1.2.3