diff options
| author | Michael Sartain <[email protected]> | 2014-10-02 08:25:55 -0700 |
|---|---|---|
| committer | Michael Sartain <[email protected]> | 2014-10-02 08:25:55 -0700 |
| commit | 55ed12f8d1eb6887d348be03aee5573d44177ffb (patch) | |
| tree | 3686f7ca78c780cd9a3d367b79a9d9250c1be7c0 /mp/src/game/server/triggers.cpp | |
| parent | * Added support for Visual C++ 2013 Express to VPC (diff) | |
| download | source-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.tar.xz source-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.zip | |
Updated the SDK with the latest code from the TF and HL2 branches.
Diffstat (limited to 'mp/src/game/server/triggers.cpp')
| -rw-r--r-- | mp/src/game/server/triggers.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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(); } |