mirror of
https://github.com/ValveSoftware/source-sdk-2013.git
synced 2025-04-08 11:01:33 +00:00
Merge 77c3831eaf
into ceb6d4d783
This commit is contained in:
commit
1ecf647e9f
2 changed files with 25 additions and 3 deletions
|
@ -84,9 +84,9 @@ void CFuncMoveLinear::Spawn( void )
|
|||
m_flMoveDistance = DotProductAbs( m_vecMoveDir, vecOBB ) - m_flLip;
|
||||
}
|
||||
|
||||
m_vecPosition1 = GetAbsOrigin() - (m_vecMoveDir * m_flMoveDistance * m_flStartPosition);
|
||||
m_vecPosition2 = m_vecPosition1 + (m_vecMoveDir * m_flMoveDistance);
|
||||
m_vecFinalDest = GetAbsOrigin();
|
||||
m_vecPosition1 = GetLocalOrigin() - ( m_vecMoveDir * m_flMoveDistance * m_flStartPosition );
|
||||
m_vecPosition2 = m_vecPosition1 + ( m_vecMoveDir * m_flMoveDistance );
|
||||
m_vecFinalDest = GetLocalOrigin();
|
||||
|
||||
SetTouch( NULL );
|
||||
|
||||
|
@ -394,3 +394,23 @@ int CFuncMoveLinear::DrawDebugTextOverlays(void)
|
|||
}
|
||||
return text_offset;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
// Purpose: Runs a fix atfer the base version clearly dosen't cut it.
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
void CFuncMoveLinear::SetParent( CBaseEntity *pParentEntity, int iAttachment )
|
||||
{
|
||||
BaseClass::SetParent( pParentEntity, iAttachment );
|
||||
|
||||
// Recompute all positions
|
||||
m_vecPosition1 = GetLocalOrigin() - ( m_vecMoveDir * m_flMoveDistance * m_flStartPosition );
|
||||
m_vecPosition2 = m_vecPosition1 + ( m_vecMoveDir * m_flMoveDistance );
|
||||
m_vecFinalDest = GetLocalOrigin();
|
||||
}
|
|
@ -36,6 +36,8 @@ public:
|
|||
|
||||
int DrawDebugTextOverlays(void);
|
||||
|
||||
void SetParent( CBaseEntity *pParentEntity, int iAttachment );
|
||||
|
||||
// Input handlers
|
||||
void InputOpen( inputdata_t &inputdata );
|
||||
void InputClose( inputdata_t &inputdata );
|
||||
|
|
Loading…
Reference in a new issue