mirror of
https://github.com/ValveSoftware/source-sdk-2013.git
synced 2025-04-09 03:24:52 +00:00
Merge 953b25c389
into 0565403b15
This commit is contained in:
commit
67c7e0d67c
1 changed files with 4 additions and 1 deletions
|
@ -2190,11 +2190,13 @@ public:
|
|||
|
||||
float m_flAlternateTicksFix; // Scale factor to apply to the push speed when running with alternate ticks
|
||||
float m_flPushSpeed;
|
||||
bool m_bFixLift;
|
||||
};
|
||||
|
||||
BEGIN_DATADESC( CTriggerPush )
|
||||
DEFINE_KEYFIELD( m_vecPushDir, FIELD_VECTOR, "pushdir" ),
|
||||
DEFINE_KEYFIELD( m_flAlternateTicksFix, FIELD_FLOAT, "alternateticksfix" ),
|
||||
DEFINE_KEYFIELD( m_bFixLift, FIELD_BOOLEAN, "liftfix" ),
|
||||
//DEFINE_FIELD( m_flPushSpeed, FIELD_FLOAT ),
|
||||
END_DATADESC()
|
||||
|
||||
|
@ -2321,7 +2323,8 @@ void CTriggerPush::Touch( CBaseEntity *pOther )
|
|||
{
|
||||
pOther->SetGroundEntity( NULL );
|
||||
Vector origin = pOther->GetAbsOrigin();
|
||||
origin.z += 1.0f;
|
||||
if ( m_bFixLift )
|
||||
origin.z += 16.0f;
|
||||
pOther->SetAbsOrigin( origin );
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue