Merge 2b6d172d86 into 7191ecc418
This commit is contained in:
commit
b54aa216ba
|
|
@ -271,6 +271,12 @@ void CTFWeaponBaseMelee::PlaySwingSound( void )
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
void CTFWeaponBaseMelee::Swing( CTFPlayer *pPlayer )
|
void CTFWeaponBaseMelee::Swing( CTFPlayer *pPlayer )
|
||||||
{
|
{
|
||||||
|
// A previous smack could be pending, so do the smack before we forget about it
|
||||||
|
if ( m_flSmackTime >= m_flNextPrimaryAttack )
|
||||||
|
{
|
||||||
|
Smack();
|
||||||
|
}
|
||||||
|
|
||||||
CalcIsAttackCritical();
|
CalcIsAttackCritical();
|
||||||
|
|
||||||
#ifdef GAME_DLL
|
#ifdef GAME_DLL
|
||||||
|
|
@ -308,7 +314,7 @@ void CTFWeaponBaseMelee::Swing( CTFPlayer *pPlayer )
|
||||||
m_potentialVictimVector.RemoveAll();
|
m_potentialVictimVector.RemoveAll();
|
||||||
const float looseSwingRange = 1.2f * GetSwingRange();
|
const float looseSwingRange = 1.2f * GetSwingRange();
|
||||||
|
|
||||||
for( int i=0; i<enemyVector.Count(); ++i )
|
for ( int i=0; i<enemyVector.Count(); ++i )
|
||||||
{
|
{
|
||||||
Vector toVictim = enemyVector[i]->WorldSpaceCenter() - pPlayer->Weapon_ShootPosition();
|
Vector toVictim = enemyVector[i]->WorldSpaceCenter() - pPlayer->Weapon_ShootPosition();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue