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 9939d01eb7 into ceb6d4d783

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

6
src/game/server/hl2/prop_combine_ball.cpp
View file

@ -769,6 +769,12 @@ void CPropCombineBall::SetBallAsLaunched( void )
WhizSoundThink();
}
bool CPropCombineBall::OnAttemptPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t reason )
{
return ( !m_bHeld || pPhysGunUser == GetOwnerEntity() ?
CDefaultPlayerPickupVPhysics::OnAttemptPhysGunPickup( pPhysGunUser, reason ) : false );
}
//-----------------------------------------------------------------------------
// Lighten the mass so it's zippy toget to the gun
//-----------------------------------------------------------------------------

1
src/game/server/hl2/prop_combine_ball.h
View file

@ -117,6 +117,7 @@ public:
private:
bool OnAttemptPhysGunPickup( CBasePlayer *, PhysGunPickup_t ) OVERRIDE;
void SetPlayerLaunched( CBasePlayer *pOwner );
float GetBallHoldDissolveTime();