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/physics_main.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/physics_main.cpp')
| -rw-r--r-- | mp/src/game/server/physics_main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mp/src/game/server/physics_main.cpp b/mp/src/game/server/physics_main.cpp index b0b2d867..a27a669a 100644 --- a/mp/src/game/server/physics_main.cpp +++ b/mp/src/game/server/physics_main.cpp @@ -742,7 +742,9 @@ void CPhysicsPushedEntities::GenerateBlockingEntityListAddBox( const Vector &vec } } - +#ifdef TF_DLL +#include "tf_logic_robot_destruction.h" +#endif //----------------------------------------------------------------------------- // Purpose: Gets a list of all entities hierarchically attached to the root //----------------------------------------------------------------------------- @@ -1841,7 +1843,9 @@ void CBaseEntity::PhysicsStepRunTimestep( float timestep ) { bool wasonground; bool inwater; +#if 0 bool hitsound = false; +#endif float speed, newspeed, control; float friction; @@ -1862,10 +1866,12 @@ void CBaseEntity::PhysicsStepRunTimestep( float timestep ) { if ( !( ( GetFlags() & FL_SWIM ) && ( GetWaterLevel() > 0 ) ) ) { +#if 0 if ( GetAbsVelocity()[2] < ( GetCurrentGravity() * -0.1 ) ) { hitsound = true; } +#endif if ( !inwater ) { |