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

Merge 63ca89b90c into 0565403b15

Browse source
This commit is contained in:
Andrew Betson 2025-04-02 21:41:29 -04:00 committed by GitHub
commit 37a8b6c75a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/shared/tf/tf_flame.cpp
View file

@ -705,11 +705,11 @@ void CTFFlameManager::OnCollide( CBaseEntity *pEnt, int iPointIndex )
// Does he have the bow?
CTFWeaponBase *pWpn = pPlayer->GetActiveTFWeapon();
if ( pWpn && pWpn->GetWeaponID() == TF_WEAPON_COMPOUND_BOW )
{
CTFCompoundBow *pBow = static_cast<CTFCompoundBow*>( pWpn );
pBow->SetArrowAlight( true );
}
if ( !pWpn || pWpn->GetWeaponID() != TF_WEAPON_COMPOUND_BOW )
return;
CTFCompoundBow *pBow = static_cast<CTFCompoundBow*>( pWpn );
pBow->SetArrowAlight( true );
}
else
{

16
src/game/shared/tf/tf_weapon_flamethrower.cpp
View file

@ -3128,19 +3128,19 @@ void CTFFlameEntity::OnCollideWithTeammate( CTFPlayer *pPlayer )
if ( !pPlayer->IsPlayerClass(TF_CLASS_SNIPER) )
return;
// Does he have the bow?
CTFWeaponBase *pWpn = pPlayer->GetActiveTFWeapon();
if ( !pWpn || pWpn->GetWeaponID() != TF_WEAPON_COMPOUND_BOW )
return;
CTFCompoundBow *pBow = static_cast<CTFCompoundBow*>( pWpn );
pBow->SetArrowAlight( true );
int iIndex = m_hEntitiesBurnt.Find( pPlayer );
if ( iIndex != m_hEntitiesBurnt.InvalidIndex() )
return;
m_hEntitiesBurnt.AddToTail( pPlayer );
// Does he have the bow?
CTFWeaponBase *pWpn = pPlayer->GetActiveTFWeapon();
if ( pWpn && pWpn->GetWeaponID() == TF_WEAPON_COMPOUND_BOW )
{
CTFCompoundBow *pBow = static_cast<CTFCompoundBow*>( pWpn );
pBow->SetArrowAlight( true );
}
}
//-----------------------------------------------------------------------------