valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-09 03:24:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge ab492f7ede into 0565403b15

Browse source
This commit is contained in:
wget 2025-04-04 17:05:08 +03:00 committed by GitHub
commit 28b9d12660
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/game/server/bmodels.cpp
View file

@ -1418,7 +1418,12 @@ void CFuncVPhysicsClip::Spawn( void )
SetModel( STRING( GetModelName() ) );
AddEffects( EF_NODRAW );
CreateVPhysics();
VPhysicsGetObject()->EnableCollisions( !m_bDisabled );
IPhysicsObject *pPhys = VPhysicsGetObject();
if ( pPhys )
{
pPhys->EnableCollisions( !m_bDisabled );
}
}
@ -1446,8 +1451,14 @@ bool CFuncVPhysicsClip::EntityPassesFilter( CBaseEntity *pOther )
if ( pFilter )
return pFilter->PassesFilter( this, pOther );
if ( pOther->GetMoveType() == MOVETYPE_VPHYSICS && pOther->VPhysicsGetObject()->IsMoveable() )
return true;
if ( pOther->GetMoveType() == MOVETYPE_VPHYSICS )
{
IPhysicsObject* pPhys = pOther->VPhysicsGetObject();
if ( pPhys && pPhys->IsMoveable() )
{
return true;
}
}
return false;
}
@ -1460,12 +1471,20 @@ bool CFuncVPhysicsClip::ForceVPhysicsCollide( CBaseEntity *pEntity )
void CFuncVPhysicsClip::InputEnable( inputdata_t &inputdata )
{
VPhysicsGetObject()->EnableCollisions(true);
IPhysicsObject *pPhys = VPhysicsGetObject();
if ( pPhys )
{
pPhys->EnableCollisions( true );
}
m_bDisabled = false;
}
void CFuncVPhysicsClip::InputDisable( inputdata_t &inputdata )
{
VPhysicsGetObject()->EnableCollisions(false);
IPhysicsObject *pPhys = VPhysicsGetObject();
if ( pPhys )
{
pPhys->EnableCollisions( false );
}
m_bDisabled = true;
}