mirror of
https://github.com/ValveSoftware/source-sdk-2013.git
synced 2025-04-08 11:01:33 +00:00
Merge f707686040
into ceb6d4d783
This commit is contained in:
commit
d6716d79f3
2 changed files with 15 additions and 1 deletions
|
@ -2637,6 +2637,18 @@ bool CPhysicsProp::CanBePickedUpByPhyscannon( void )
|
|||
return true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Clear all flags after respawn
|
||||
//-----------------------------------------------------------------------------
|
||||
void CPhysicsProp::Break( CBaseEntity *pBreaker, const CTakeDamageInfo &info )
|
||||
{
|
||||
m_bFirstCollisionAfterLaunch = false;
|
||||
// Setup the think function to remove the flags
|
||||
RegisterThinkContext( "PROP_CLEARFLAGS" );
|
||||
SetContextThink( &CPhysicsProp::ClearFlagsThink, gpGlobals->curtime, "PROP_CLEARFLAGS" );
|
||||
CBreakableProp::Break( pBreaker, info );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
@ -62,7 +62,7 @@ public:
|
|||
|
||||
virtual int OnTakeDamage( const CTakeDamageInfo &info );
|
||||
void Event_Killed( const CTakeDamageInfo &info );
|
||||
void Break( CBaseEntity *pBreaker, const CTakeDamageInfo &info );
|
||||
virtual void Break( CBaseEntity *pBreaker, const CTakeDamageInfo &info );
|
||||
void BreakThink( void );
|
||||
void AnimateThink( void );
|
||||
|
||||
|
@ -346,6 +346,8 @@ public:
|
|||
virtual void VPhysicsUpdate( IPhysicsObject *pPhysics );
|
||||
virtual void VPhysicsCollision( int index, gamevcollisionevent_t *pEvent );
|
||||
|
||||
void Break( CBaseEntity *pBreaker, const CTakeDamageInfo &info )override;
|
||||
|
||||
void InputWake( inputdata_t &inputdata );
|
||||
void InputSleep( inputdata_t &inputdata );
|
||||
void InputEnableMotion( inputdata_t &inputdata );
|
||||
|
|
Loading…
Reference in a new issue