mirror
/
source-sdk-2013
mirror of https://github.com/ValveSoftware/source-sdk-2013
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge e5d7843e5b into 7191ecc418

This commit is contained in:
Benoist 2025-12-16 01:19:53 -08:00 committed by GitHub
parent 7191ecc418 e5d7843e5b
commit 0b1c7aa351
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/server/tf/tf_player.cpp
View File

@ -9848,21 +9848,24 @@ int CTFPlayer::OnTakeDamage( const CTakeDamageInfo &inputInfo )
}
CTFWeaponBase *pTFWeapon = GetKilleaterWeaponFromDamageInfo( &info );
if ( !pTFWeapon )
if ( pTFAttacker )
{
// Check Wearable instead like demoshields or manntreads
CTFWearable *pWearable = dynamic_cast< CTFWearable* >( info.GetWeapon() );
if ( pWearable )
CTFWeaponBase *pTFWeapon = GetKilleaterWeaponFromDamageInfo( &info );
if ( !pTFWeapon )
{
EconEntity_OnOwnerKillEaterEvent_Batched( pWearable, pTFAttacker, this, kKillEaterEvent_DamageDealt, info.GetDamage() );
EconEntity_OnOwnerKillEaterEvent_Batched( pWearable, pTFAttacker, this, kKillEaterEvent_PlayersHit, 1 );
// Check Wearable instead like demoshields or manntreads
CTFWearable *pWearable = dynamic_cast< CTFWearable* >( info.GetWeapon() );
if ( pWearable )
{
EconEntity_OnOwnerKillEaterEvent_Batched( pWearable, pTFAttacker, this, kKillEaterEvent_DamageDealt, info.GetDamage() );
EconEntity_OnOwnerKillEaterEvent_Batched( pWearable, pTFAttacker, this, kKillEaterEvent_PlayersHit, 1 );
}
}
else
{
EconEntity_OnOwnerKillEaterEvent_Batched( pTFWeapon, pTFAttacker, this, kKillEaterEvent_DamageDealt, info.GetDamage() );
EconEntity_OnOwnerKillEaterEvent_Batched( pTFWeapon, pTFAttacker, this, kKillEaterEvent_PlayersHit, 1 );
}
}
else
{
EconEntity_OnOwnerKillEaterEvent_Batched( pTFWeapon, pTFAttacker, this, kKillEaterEvent_DamageDealt, info.GetDamage() );
EconEntity_OnOwnerKillEaterEvent_Batched( pTFWeapon, pTFAttacker, this, kKillEaterEvent_PlayersHit, 1 );
}
if ( bTookDamage && m_Shared.InCond( TF_COND_GAS ) )