valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-08 11:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 59f00ceadb into ceb6d4d783

Browse source
This commit is contained in:
speedvoltage 2025-03-29 21:43:37 +01:00 committed by GitHub
commit 834dd024de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/shared/hl2mp/weapon_physcannon.cpp
View file

@ -792,6 +792,13 @@ void CPlayerPickupController::Use( CBaseEntity *pActivator, CBaseEntity *pCaller
//Adrian: Oops, our object became motion disabled, let go!
IPhysicsObject *pPhys = pAttached->VPhysicsGetObject();
if ( !pPhys )
{
Shutdown();
return;
}
if ( pPhys && pPhys->IsMoveable() == false )
{
Shutdown();
@ -808,7 +815,7 @@ void CPlayerPickupController::Use( CBaseEntity *pActivator, CBaseEntity *pCaller
}
#endif
// +ATTACK will throw phys objects
if ( m_pPlayer->m_nButtons & IN_ATTACK )
if ( pPhys && m_pPlayer->m_nButtons & IN_ATTACK )
{
Shutdown( true );
Vector vecLaunch;