MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-05 02:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #266 from rlenhub/develop

Browse Source 
Implement "OnPhysGunPull" output in CPhysicsProp
This commit is contained in:
Blixibon 2025-01-02 08:26:35 -06:00 committed by GitHub
commit 72bd5fe948
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sp/src/game/server/hl2/weapon_physcannon.cpp
View File

@ -2723,6 +2723,11 @@ CWeaponPhysCannon::FindObjectResult_t CWeaponPhysCannon::FindObject( void )
pullDir *= (mass + 0.5) * (1/50.0f); pullDir *= (mass + 0.5) * (1/50.0f);
} }
CPhysicsProp* pProp = dynamic_cast<CPhysicsProp*>(pObj);
if (pProp) {
pProp->OnPhysGunPull( pOwner );
}
// Nudge it towards us // Nudge it towards us
pObj->ApplyForceCenter( pullDir ); pObj->ApplyForceCenter( pullDir );
return OBJECT_NOT_FOUND; return OBJECT_NOT_FOUND;

8
sp/src/game/server/props.cpp
View File

@ -3021,6 +3021,7 @@ BEGIN_DATADESC( CPhysicsProp )
DEFINE_OUTPUT( m_MotionEnabled, "OnMotionEnabled" ), DEFINE_OUTPUT( m_MotionEnabled, "OnMotionEnabled" ),
DEFINE_OUTPUT( m_OnPhysGunPickup, "OnPhysGunPickup" ), DEFINE_OUTPUT( m_OnPhysGunPickup, "OnPhysGunPickup" ),
DEFINE_OUTPUT( m_OnPhysGunOnlyPickup, "OnPhysGunOnlyPickup" ), DEFINE_OUTPUT( m_OnPhysGunOnlyPickup, "OnPhysGunOnlyPickup" ),
DEFINE_OUTPUT( m_OnPhysGunPull, "OnPhysGunPull" ),
DEFINE_OUTPUT( m_OnPhysGunPunt, "OnPhysGunPunt" ), DEFINE_OUTPUT( m_OnPhysGunPunt, "OnPhysGunPunt" ),
DEFINE_OUTPUT( m_OnPhysGunDrop, "OnPhysGunDrop" ), DEFINE_OUTPUT( m_OnPhysGunDrop, "OnPhysGunDrop" ),
DEFINE_OUTPUT( m_OnPlayerUse, "OnPlayerUse" ), DEFINE_OUTPUT( m_OnPlayerUse, "OnPlayerUse" ),
@ -3391,6 +3392,13 @@ void CPhysicsProp::OnPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t r
CheckRemoveRagdolls(); CheckRemoveRagdolls();
} }
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CPhysicsProp::OnPhysGunPull( CBasePlayer* pPhysGunUser ) {
m_OnPhysGunPull.FireOutput(pPhysGunUser, this);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
sp/src/game/server/props.h
View File

@ -413,6 +413,7 @@ public:
void EnableMotion( void ); void EnableMotion( void );
bool CanBePickedUpByPhyscannon( void ); bool CanBePickedUpByPhyscannon( void );
void OnPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t reason ); void OnPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t reason );
void OnPhysGunPull( CBasePlayer *pPhysGunUser );
void OnPhysGunDrop( CBasePlayer *pPhysGunUser, PhysGunDrop_t reason ); void OnPhysGunDrop( CBasePlayer *pPhysGunUser, PhysGunDrop_t reason );
bool GetPropDataAngles( const char *pKeyName, QAngle &vecAngles ); bool GetPropDataAngles( const char *pKeyName, QAngle &vecAngles );
@ -446,6 +447,7 @@ private:
COutputEvent m_OnPhysGunPickup; COutputEvent m_OnPhysGunPickup;
COutputEvent m_OnPhysGunPunt; COutputEvent m_OnPhysGunPunt;
COutputEvent m_OnPhysGunOnlyPickup; COutputEvent m_OnPhysGunOnlyPickup;
COutputEvent m_OnPhysGunPull;
COutputEvent m_OnPhysGunDrop; COutputEvent m_OnPhysGunDrop;
COutputEvent m_OnPlayerUse; COutputEvent m_OnPlayerUse;
COutputEvent m_OnPlayerPickup; COutputEvent m_OnPlayerPickup;